From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F379D138334 for ; Sun, 21 Apr 2019 05:34:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B1909E0AE2; Sun, 21 Apr 2019 05:34:08 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 999E6E0AE2 for ; Sun, 21 Apr 2019 05:34:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 968AD341BC1 for ; Sun, 21 Apr 2019 05:34:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E32DE5D0 for ; Sun, 21 Apr 2019 05:34:03 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1555824824.b7e61844bd3d66f61ce9967df78a5d30f3be8d00.robbat2@OpenRC> Subject: [gentoo-commits] proj/netifrc:master commit in: init.d/ X-VCS-Repository: proj/netifrc X-VCS-Files: init.d/net.lo.in X-VCS-Directories: init.d/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: b7e61844bd3d66f61ce9967df78a5d30f3be8d00 X-VCS-Branch: master Date: Sun, 21 Apr 2019 05:34:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c1ac9f75-7b2f-4304-abc4-fdd7a74a963f X-Archives-Hash: a3671ae65d144fb4e1cbff9390653f85 commit: b7e61844bd3d66f61ce9967df78a5d30f3be8d00 Author: Robin H. Johnson gentoo org> AuthorDate: Sun Apr 21 05:28:33 2019 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sun Apr 21 05:33:44 2019 +0000 URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=b7e61844 init.d/net.lo.in: shellcheck: stop() Signed-off-by: Robin H. Johnson gentoo.org> init.d/net.lo.in | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/init.d/net.lo.in b/init.d/net.lo.in index 9ba2e03..a5ac0fe 100644 --- a/init.d/net.lo.in +++ b/init.d/net.lo.in @@ -830,14 +830,16 @@ stop() # correctly if we go back to multiuser. yesno ${keep_network:-YES} && yesno $RC_GOINGDOWN && return 0 - local IFACE=$(get_interface) module= - local IFVAR=$(shell_var "${IFACE}") opts= + local IFACE='' module='' + local IFVAR='' + IFACE=$(get_interface) + IFVAR=$(shell_var "${IFACE}") einfo "Bringing down interface ${IFACE}" eindent if [ -z "${MODULES}" ]; then - local MODULES= + local MODULES='' _load_modules false fi @@ -883,7 +885,7 @@ stop() # If not in background, and not loopback then bring the interface down # unless overridden. if ! yesno ${IN_BACKGROUND} && \ - [ "${IFACE}" != "lo" -a "${IFACE}" != "lo0" ]; then + [ "${IFACE}" != "lo" ] && [ "${IFACE}" != "lo0" ]; then eval module=\$ifdown_${IFVAR} module=${module:-${ifdown:-YES}} yesno ${module} && _down 2>/dev/null