ovs-ctl: Remove code for upgrading from Open vSwitch 1.6 and earlier.

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. It's almost impossible to do this upgrade in any case since there is no overlap in the base kernel versions supported by the out of tree modules in the two versions (the only possibility is running the new version of OVS on the upstream module from Linux 3.3). Signed-off-by: Ben Pfaff <[email protected]> Acked-by: Jesse Gross <[email protected]>
water0615 · Mar 17, 2016 · 87530bc · 87530bc
1 parent c416eaf
commit 87530bc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -351,10 +350,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