diff mbox

[ovs-dev] debian: Add SYSTEMCTL_SKIP_REDIRECT to init files

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

Commit Message

Raymond Burkholder May 24, 2017, 7:56 p.m. UTC 
From: Raymond Burkholder <ray@oneunified.net>

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(+)

Comments

Gurucharan Shetty May 24, 2017, 8:08 p.m. UTC | #1 
On 24 May 2017 at 12:56, root <ray@oneunified.net> wrote:

> From: Raymond Burkholder <ray@oneunified.net>
>
> 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>
>
Thanks. Lets wait for a couple of days to see if anyone else has any
comments.


> ---
>  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 --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
> --
> 2.11.0
>
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
Gregory Rose May 24, 2017, 8:27 p.m. UTC | #2 
On Wed, 2017-05-24 at 19:56 +0000, root wrote:
> From: Raymond Burkholder <ray@oneunified.net>
> 
> 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>

Maybe this is a silly question but are we sure someone at Debian didn't
make a typo?

I mean, why?  Why would they do this?

- Greg

> ---
>  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 --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
> -- 
> 2.11.0
> 
>
Raymond Burkholder May 24, 2017, 8:41 p.m. UTC | #3 
> On 24 May 2017, at 14:27, Greg Rose <gvrose8192@gmail.com> wrote:
> 
> On Wed, 2017-05-24 at 19:56 +0000, root wrote:
>> From: Raymond Burkholder <ray@oneunified.net>
>> 
>> 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>
> 
> Maybe this is a silly question but are we sure someone at Debian didn't
> make a typo?
> 
> I mean, why?  Why would they do this?

Good question.  But there is an answer, and looks like it was a conscious decision, committed back in January:

http://sources.debian.net/src/systemd/232-23/debian/changelog/?hl=293

"* debian/extra/init-functions.d/40-systemd: Rename _SYSTEMCTL_SKIP_REDIRECT.
    Rename _SYSTEMCTL_SKIP_REDIRECT to SYSTEMCTL_SKIP_REDIRECT to be more
    consistent with other environment variables which are used internally by
    systemd, like SYSTEMCTL_SKIP_SYSV."
Gregory Rose May 24, 2017, 8:45 p.m. UTC | #4 
On Wed, 2017-05-24 at 14:41 -0600, Raymond Burkholder wrote:
> > On 24 May 2017, at 14:27, Greg Rose <gvrose8192@gmail.com> wrote:
> > 
> > On Wed, 2017-05-24 at 19:56 +0000, root wrote:
> >> From: Raymond Burkholder <ray@oneunified.net>
> >> 
> >> 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>
> > 
> > Maybe this is a silly question but are we sure someone at Debian didn't
> > make a typo?
> > 
> > I mean, why?  Why would they do this?
> 
> Good question.  But there is an answer, and looks like it was a conscious decision, committed back in January:
> 
> http://sources.debian.net/src/systemd/232-23/debian/changelog/?hl=293
> 
> "* debian/extra/init-functions.d/40-systemd: Rename _SYSTEMCTL_SKIP_REDIRECT.
>     Rename _SYSTEMCTL_SKIP_REDIRECT to SYSTEMCTL_SKIP_REDIRECT to be more
>     consistent with other environment variables which are used internally by
>     systemd, like SYSTEMCTL_SKIP_SYSV."

Well OK then... Now I'm wondering why the original underscore was added!
LOL. That leads to insanity I guess.

Thanks!

- Greg
Gurucharan Shetty May 30, 2017, 4:25 p.m. UTC | #5 
On 24 May 2017 at 12:56, root <ray@oneunified.net> wrote:

> From: Raymond Burkholder <ray@oneunified.net>
>
> 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>
>

I added you to AUTHORS and applied this to master and backported all the
way back to 2.3


> ---
>  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 --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
> --
> 2.11.0
>
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
>
> _______________________________________________
> dev mailing list
> dev@openvswitch.org
> https://mail.openvswitch.org/mailman/listinfo/ovs-dev
>
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