public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Robin H. Johnson" <robbat2@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/netifrc:master commit in: init.d/
Date: Sun, 21 Apr 2019 05:34:03 +0000 (UTC)	[thread overview]
Message-ID: <1555824816.b8ea3b8f78cb91cd48661ba81f3e261c5ff12f44.robbat2@OpenRC> (raw)

commit:     b8ea3b8f78cb91cd48661ba81f3e261c5ff12f44
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 21 05:25:29 2019 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 21 05:33:36 2019 +0000
URL:        https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=b8ea3b8f

init.d/net.lo.in: shellcheck: _load_config

Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 init.d/net.lo.in | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index c8af39f..30ab7fd 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -530,8 +530,9 @@ _load_modules()
 
 _load_config()
 {
-	local config="$(_get_array "config_${IFVAR}")"
-	local fallback="$(_get_array fallback_${IFVAR})"
+	local config='' fallback=''
+	config="$(_get_array "config_${IFVAR}")"
+	fallback="$(_get_array fallback_${IFVAR})"
 
 	config_index=0
 	local IFS="$__IFS"
@@ -545,7 +546,7 @@ _load_config()
 		# Of course, we may have a single address added old style.
 		# If the NEXT argument is a v4 or v6 address, it's the next config.
 		# Otherwise, it's arguments to the first config...
-		if [ "${2#*.*}" = "${2}" -a "${2#*:*}" = "${2}" ]; then
+		if [ "${2#*.*}" = "${2}" ] && [  "${2#*:*}" = "${2}" ]; then
 			# Not an IPv4/IPv6
 			local IFS="$__IFS"
 			set -- ${config}
@@ -553,7 +554,7 @@ _load_config()
 	fi
 
 	# Ensure that loopback has the correct address
-	if [ "${IFACE}" = "lo" -o "${IFACE}" = "lo0" ]; then
+	if [ "${IFACE}" = "lo" ] || [ "${IFACE}" = "lo0" ]; then
 		if [ "$1" != "null" ]; then
 		   	config_0="127.0.0.1/8"
 			config_index=1


             reply	other threads:[~2019-04-21  5:34 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-21  5:34 Robin H. Johnson [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-01-07  9:42 [gentoo-commits] proj/netifrc:master commit in: init.d/ Sam James
2021-03-31  1:11 Patrick McLean
2020-09-07 13:03 Lars Wendler
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2019-04-21  5:34 Robin H. Johnson
2017-11-14 20:48 Robin H. Johnson
2017-11-14 20:48 Robin H. Johnson
2016-10-24 20:52 Robin H. Johnson
2016-10-24  0:23 Robin H. Johnson
2016-10-24  0:23 Robin H. Johnson
2016-10-23 23:50 Robin H. Johnson
2016-07-05 18:13 Robin H. Johnson
2015-11-08 14:30 Robin H. Johnson
2015-11-08 14:30 Robin H. Johnson
2015-05-25 10:04 Mike Frysinger
2015-05-25 10:01 Mike Frysinger
2015-01-09 17:17 Robin H. Johnson
2014-10-11 19:47 Robin H. Johnson
2014-07-17 17:56 Robin H. Johnson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1555824816.b8ea3b8f78cb91cd48661ba81f3e261c5ff12f44.robbat2@OpenRC \
    --to=robbat2@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox