pvepatches/fix-init-script-patch

   1 Index: devel/debian/openvswitch-switch.init
   2 ===================================================================
   3 --- devel.orig/debian/openvswitch-switch.init
   4 +++ devel/debian/openvswitch-switch.init
   5 @@ -89,15 +89,15 @@ restart () {
   6          if [ -e /sys/module/openvswitch ]; then
   7              LOADED_SRCVERSION=`cat /sys/module/openvswitch/srcversion \
   8                                 2>/dev/null`
   9 -            LOADED_VERSION=`cat /sys/module/openvswitch/version \
  10 -                            2>/dev/null`
  11 +       elif [ -e /sys/module/openvswitch_mod ]; then
  12 +           LOADED_SRCVERSION=`cat /sys/module/openvswitch_mod/srcversion \
  13 +                               2>/dev/null`
  14          fi
  15          SRCVERSION=`modinfo -F srcversion openvswitch 2>/dev/null`
  16 -        VERSION=`modinfo -F version openvswitch 2>/dev/null`
  17
  18          ovs_ctl_log "Package upgrading:\n"\
  19 -                    "Loaded version: ${LOADED_VERSION} ${LOADED_SRCVERSION}.\n"\
  20 -                    "Version on disk: ${VERSION} ${SRCVERSION}."
  21 +                    "Loaded version: ${LOADED_SRCVERSION}.\n"\
  22 +                    "Version on disk: ${SRCVERSION}."
  23
  24          # If the kernel module was previously loaded and it is different than
  25          # the kernel module on disk, then do a 'force-reload-kmod'.