OVS 1.7 was released in July 2012, so by the time current OVS is released,
it will be almost four years old. I think that this is long enough to
remove special upgrade code.
Signed-off-by: Ben Pfaff <b...@ovn.org>
---
debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in | 2 +-
debian/openvswitch-switch.init | 7 +------
utilities/ovs-ctl.in | 8 ++------
3 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in
b/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in
index 3ed4800..2241acf 100755
--- a/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in
+++ b/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in
@@ -9,7 +9,7 @@ set -e
# If the kernel module is already loaded, we have nothing to do here.
# A force-reload-kmod should be run manually to use the new kernel module.
-if [ -e /sys/module/openvswitch ] || [ -e /sys/module/openvswitch_mod ]; then
+if [ -e /sys/module/openvswitch ]; then
exit 0
fi
diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index a045f3b..1e94015 100755
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -1,6 +1,6 @@
#! /bin/sh
#
-# Copyright (C) 2011, 2012 Nicira, Inc.
+# Copyright (C) 2011, 2012, 2016 Nicira, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -91,11 +91,6 @@ restart () {
2>/dev/null`
LOADED_VERSION=`cat /sys/module/openvswitch/version \
2>/dev/null`
- elif [ -e /sys/module/openvswitch_mod ]; then
- LOADED_SRCVERSION=`cat /sys/module/openvswitch_mod/srcversion \
- 2>/dev/null`
- LOADED_VERSION=`cat /sys/module/openvswitch_mod/version \
- 2>/dev/null`
fi
SRCVERSION=`modinfo -F srcversion openvswitch 2>/dev/null`
VERSION=`modinfo -F version openvswitch 2>/dev/null`
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in
index c1fdd1a..0579171 100755
--- a/utilities/ovs-ctl.in
+++ b/utilities/ovs-ctl.in
@@ -52,8 +52,7 @@ insert_mod_if_required () {
fi
# If openvswitch is already loaded then we're done.
- test -e /sys/module/openvswitch -o -e /sys/module/openvswitch_mod && \
- return 0
+ test -e /sys/module/openvswitch && return 0
# Load openvswitch. If that's successful then we're done.
insert_mods && return 0
@@ -352,10 +351,7 @@ force_reload_kmod () {
fi
done
- # try both old and new names in case this is post upgrade
- if test -e /sys/module/openvswitch_mod; then
- action "Removing openvswitch module" rmmod openvswitch_mod
- elif test -e /sys/module/openvswitch; then
+ if test -e /sys/module/openvswitch; then
action "Removing openvswitch module" rmmod openvswitch
fi
--
2.1.3
_______________________________________________
dev mailing list
dev@openvswitch.org
http://openvswitch.org/mailman/listinfo/dev
