From patchwork Wed May 24 19:43:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Raymond Burkholder X-Patchwork-Id: 766661 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wY2rc4fpcz9sP8 for ; Thu, 25 May 2017 05:43:43 +1000 (AEST) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 91810BD9; Wed, 24 May 2017 19:43:40 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id D0BA340C for ; Wed, 24 May 2017 19:43:39 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail1.oneunified.net (mail1.oneunified.net [63.85.42.215]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 3ADF015F for ; Wed, 24 May 2017 19:43:38 +0000 (UTC) X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RP_MATCHES_RCVD autolearn=ham version=3.3.1 X-OneUnified-MailScanner-Watermark: 1496259816.49069@Jy+ouAcR7r/0afceE78I6Q X-OneUnified-MailScanner-From: ray@oneunified.net X-OneUnified-MailScanner: Found to be clean X-OneUnified-MailScanner-ID: v4OJhX8Q024597 X-OneUnified-MailScanner-Information: Please contact the ISP for more information Received: from localhost.localdomain (h96-45-2-188-eidnet.org.2.45.96.in-addr.arpa [96.45.2.188] (may be forged)) (authenticated bits=0) by mail1.oneunified.net (8.14.4/8.14.4/Debian-4) with ESMTP id v4OJhX8Q024597 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Wed, 24 May 2017 19:43:34 GMT From: root To: dev@openvswitch.org Date: Wed, 24 May 2017 19:43:31 +0000 Message-Id: <20170524194331.11896-1-ray@oneunified.net> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [PATCH] Add SYSTEMCTL_SKIP_REDIRECT to init files X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org 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 Suggested-by: Guru Shetty --- 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