* Removed SYSTEMCTL_SKIP_REDIRECT from:

    - openvswitch-switch init scripts (Closes: #910474.
    - ovn-central.init (Closes: #910472).
    - ovn-host.init (Closes: #910475).
    - ovn-controller-vtep.init (Closes: #910476).
  * Added mkdir -p /var/run in ovs startup (Closes: #930843).

diff --git a/debian/changelog b/debian/changelog
index d1597d5ca617731b87ac91cda669d8334da4d688..acf59f80356da34af2560399ef951396b296afbf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,12 @@ openvswitch (2.11.0+2019.06.25+git.9ebe795035+ds1-4) UNRELEASED; urgency=medium
   * Fix installing vtep/vtep-ctl (Closes: #866319).
   * Fix moving /usr/sbin/ovs-vswitchd around on non-dpdk arch, fixing FTBFS on
     these.
+  * Removed SYSTEMCTL_SKIP_REDIRECT from:
+    - openvswitch-switch init scripts (Closes: #910474.
+    - ovn-central.init (Closes: #910472).
+    - ovn-host.init (Closes: #910475).
+    - ovn-controller-vtep.init (Closes: #910476).
+  * Added mkdir -p /var/run in ovs startup (Closes: #930843).
 
  -- Thomas Goirand <zigo@debian.org>  Thu, 31 Oct 2019 11:38:08 +0100
 

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 43a70e5e1f3b2e60e10a4099eb7b561fbfca2129..5897052a3b61a9e86efa06f380f66af03327e962 100755 (executable)
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -27,14 +27,13 @@
 
 (test -x /usr/sbin/ovs-vswitchd && test -x /usr/sbin/ovsdb-server) || exit 0
 
-_SYSTEMCTL_SKIP_REDIRECT=yes
-SYSTEMCTL_SKIP_REDIRECT=yes
-
 . /lib/lsb/init-functions
 
 . /usr/share/openvswitch/scripts/ovs-lib
 test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch
 
+mkdir -p /run/openvswitch
+
 network_interfaces () {
     INTERFACES="/etc/network/interfaces"
     [ -e "${INTERFACES}" ] || return
@@ -123,6 +122,12 @@ case $1 in
     stop | force-stop)
         stop
         ;;
+    systemd-start)
+        start
+        ;;
+    systemd-stop)
+        stop
+        ;;
     reload | force-reload)
         # The OVS daemons keep up-to-date.
         ;;

diff --git a/debian/openvswitch-switch.service b/debian/openvswitch-switch.service
index ff2acbe0461def29499f43fd821658263ac12c7a..bcfdbe05efa3862bfeecaab20be137e71b2d65c4 100644 (file)
--- a/debian/openvswitch-switch.service
+++ b/debian/openvswitch-switch.service
@@ -6,8 +6,8 @@ Before=networking.service
 
 [Service]
 Type=oneshot
-ExecStart=/etc/init.d/openvswitch-switch start
-ExecStop=/etc/init.d/openvswitch-switch stop
+ExecStart=/etc/init.d/openvswitch-switch systemd-start
+ExecStop=/etc/init.d/openvswitch-switch systemd-stop
 RemainAfterExit=yes
 
 [Install]

diff --git a/debian/ovn-central.init b/debian/ovn-central.init
index b627e94ab2aba3d691b915172ac22217e7cd7613..af4c5b20ba1134507c371fe84a807b1963decdf4 100755 (executable)
--- a/debian/ovn-central.init
+++ b/debian/ovn-central.init
@@ -17,8 +17,6 @@
 test -x /usr/bin/ovn-northd  || exit 0
 test -x /usr/share/openvswitch/scripts/ovn-ctl || exit 0
 
-_SYSTEMCTL_SKIP_REDIRECT=yes
-
 . /usr/share/openvswitch/scripts/ovs-lib
 if [ -e /etc/default/ovn-central ]; then
     . /etc/default/ovn-central

diff --git a/debian/ovn-controller-vtep.init b/debian/ovn-controller-vtep.init
index abb19f0bb467af120ff4c95ec30545d5fb1d599d..49a574177afc9ca1ff048e2f835ffadb88c5f6b7 100755 (executable)
--- a/debian/ovn-controller-vtep.init
+++ b/debian/ovn-controller-vtep.init
@@ -17,8 +17,6 @@
 test -x /usr/bin/ovn-controller-vtep  || exit 0
 test -x /usr/share/openvswitch/scripts/ovn-ctl || exit 0
 
-_SYSTEMCTL_SKIP_REDIRECT=yes
-
 . /usr/share/openvswitch/scripts/ovs-lib
 if [ -e /etc/default/ovn-controller-vtep ]; then
     . /etc/default/ovn-controller-vtep

diff --git a/debian/ovn-host.init b/debian/ovn-host.init
index e97c3074758199d4dd752f0d531b0df204ab8329..e0297c14f0b955ffd4ff66db21e4588eef3beb2e 100755 (executable)
--- a/debian/ovn-host.init
+++ b/debian/ovn-host.init
@@ -17,8 +17,6 @@
 test -x /usr/bin/ovn-controller  || exit 0
 test -x /usr/share/openvswitch/scripts/ovn-ctl || exit 0
 
-_SYSTEMCTL_SKIP_REDIRECT=yes
-
 . /usr/share/openvswitch/scripts/ovs-lib
 if [ -e /etc/default/ovn-host ]; then
     . /etc/default/ovn-host