debian: Add SYSTEMCTL_SKIP_REDIRECT to init files

Current versions of systemd in Debian Stretch use
SYSTEMCTL_SKIP_REDIRECT instead of _SYSTEMCTL_SKIP_REDIRECT.
Provide both variables in the .init files.

Signed-off-by: Raymond Burkholder <ray@oneunified.net>
Suggested-by: Guru Shetty <guru@ovn.org>
Signed-off-by: Gurucharan Shetty <guru@ovn.org>

diff --git a/AUTHORS.rst b/AUTHORS.rst
index a8bf1ee0c6af32028ef65d0b48d5f2f3b9b684eb..292b9310e57b363f2f6a6a475ffd83c6012505fe 100644 (file)
--- a/AUTHORS.rst
+++ b/AUTHORS.rst
@@ -250,6 +250,7 @@ Rami Rosen                      ramirose@gmail.com
 Ramu Ramamurthy                 ramu.ramamurthy@us.ibm.com
 Randall Sharo                   andall.sharo@navy.mil
 Ravi Kerur                      Ravi.Kerur@telekom.com
+Raymond Burkholder              ray@oneunified.net
 Reid Price                      reid@nicira.com
 Remko Tronçon                   git@el-tramo.be
 Rich Lane                       rlane@bigswitch.com

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 1e94015d1eb357c8f766803d4b30f425abbca34d..5c7c08b3a1f9cc60ba1df3f7e1e6a473448a77cc 100755 (executable)
--- a/debian/openvswitch-switch.init
+++ b/debian/openvswitch-switch.init
@@ -28,6 +28,7 @@
 (test -x /usr/sbin/ovs-vswitchd && test -x /usr/sbin/ovsdb-server) || exit 0
 
 _SYSTEMCTL_SKIP_REDIRECT=yes
+SYSTEMCTL_SKIP_REDIRECT=yes
 
 . /usr/share/openvswitch/scripts/ovs-lib
 test -e /etc/default/openvswitch-switch && . /etc/default/openvswitch-switch

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

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

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