diff options
Diffstat (limited to 'debian')
| -rwxr-xr-x | debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in | 2 | ||||
| -rwxr-xr-x | debian/openvswitch-switch.init | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in b/debian/openvswitch-datapath-module-_KVERS_.postinst.modules.in index 3ed480080..2241acfc5 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 a045f3b73..1e94015d1 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` |