diff mbox

[ovs-dev] Add SYSTEMCTL_SKIP_REDIRECT to init files

Message ID 20170524194331.11896-1-ray@oneunified.net
State Accepted
Headers show

Commit Message

Raymond Burkholder May 24, 2017, 7:43 p.m. UTC 
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>
---
 debian/openvswitch-switch.init  | 1 +
 debian/ovn-central.init         | 1 +
 debian/ovn-controller-vtep.init | 1 +
 debian/ovn-host.init            | 1 +
 4 files changed, 4 insertions(+)
diff mbox

Patch

diff --git a/debian/openvswitch-switch.init b/debian/openvswitch-switch.init
index 1e94015d1..5c7c08b3a 100755
--- 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 0c5b09e6a..60cee95a3 100755
--- 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 acba3297d..be0a24358 100755
--- 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 bddf62815..39c3bcf16 100755
--- 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