pvepatches/fix-init-depends.patch

   1 Index: new/debian/openvswitch-switch.init
   2 ===================================================================
   3 --- new.orig/debian/openvswitch-switch.init     2014-06-11 10:31:50.000000000 +0200
   4 +++ new/debian/openvswitch-switch.init  2014-06-11 10:32:50.000000000 +0200
   5 @@ -16,10 +16,12 @@
   6  #
   7  ### BEGIN INIT INFO
   8  # Provides:          openvswitch-switch
   9 -# Required-Start:    $network $named $remote_fs $syslog
  10 -# Required-Stop:     $remote_fs
  11 -# Default-Start:     2 3 4 5
  12 -# Default-Stop:      0 1 6
  13 +# Required-Start:    pvenetcommit $local_fs
  14 +# Required-Stop:     $local_fs
  15 +# X-Start-Before:    networking
  16 +# X-Stop-After:      networking
  17 +# Default-Start:     S
  18 +# Default-Stop:      0 6
  19  # Short-Description: Open vSwitch switch
  20  # Description:       openvswitch-switch provides the userspace components and utilities for
  21  #                    the Open vSwitch kernel-based switch.
  22 @@ -38,6 +40,13 @@
  23      [ -n "${bridges}" ] && $1 --allow=ovs ${bridges}
  24  }
  25
  26 +sendsigs_omit() {
  27 +       OMITDIR=/run/sendsigs.omit.d
  28 +       mkdir -p $OMITDIR
  29 +       ln -sf /var/run/openvswitch/ovs-vswitchd.pid $OMITDIR/ovs-vswitchd.pid
  30 +       ln -sf /var/run/openvswitch/ovsdb-server.pid $OMITDIR/ovsdb-server.pid
  31 +}
  32 +
  33  load_kmod () {
  34      ovs_ctl load-kmod || exit $?
  35  }
  36 @@ -61,6 +70,9 @@
  37             exit 0
  38         fi
  39      fi
  40 +
  41 +    sendsigs_omit
  42 +
  43      set ovs_ctl ${1-start} --system-id=random
  44      if test X"$FORCE_COREFILES" != X; then
  45         set "$@" --force-corefiles="$FORCE_COREFILES"
  46 Index: new/debian/rules
  47 ===================================================================
  48 --- new.orig/debian/rules       2013-12-18 07:59:19.000000000 +0100
  49 +++ new/debian/rules    2014-06-11 10:32:30.000000000 +0200
  50 @@ -131,7 +131,8 @@
  51         dh_installexamples
  52         dh_installdebconf
  53         dh_installlogrotate
  54 -       dh_installinit -R
  55 +       dh_installinit -p "openvswitch-switch" -R -- start 20 S . stop 80 0 6 .
  56 +       dh_installinit --remaining-packages -R
  57         dh_installcron
  58         dh_installman --language=C
  59         dh_link