aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Macku <jamacku@redhat.com>2019-01-08 17:23:13 +0100
committerLukáš Nykrýn <lnykryn@redhat.com>2020-03-24 11:51:45 +0100
commit55ee446c0715b013e6d54860ae65e55baf544dc3 (patch)
tree03960d87bcc4d72cc91d51d6aff651b8878b38b7
parent4e2400798397ae2567a8cfd824c14ccd41983b08 (diff)
downloadinitscripts-55ee446c0715b013e6d54860ae65e55baf544dc3.tar
initscripts-55ee446c0715b013e6d54860ae65e55baf544dc3.tar.gz
initscripts-55ee446c0715b013e6d54860ae65e55baf544dc3.tar.bz2
initscripts-55ee446c0715b013e6d54860ae65e55baf544dc3.tar.xz
initscripts-55ee446c0715b013e6d54860ae65e55baf544dc3.zip
Replace grep -EL with subshell since -L changed behaviour
Sugested by @lnykryn Related to issue #300
-rwxr-xr-xetc/rc.d/init.d/network4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/rc.d/init.d/network b/etc/rc.d/init.d/network
index 414bee06..bc5c1502 100755
--- a/etc/rc.d/init.d/network
+++ b/etc/rc.d/init.d/network
@@ -124,7 +124,7 @@ start)
continue
fi
- if LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then
+ if ( . ./ifcfg-"$i" ; is_false "$ONBOOT" ) ; then
# this loads the module, to preserve ordering
is_available $i
continue
@@ -135,7 +135,7 @@ start)
# Bring up xDSL and VPN interfaces
for i in $vlaninterfaces $bridgeinterfaces $xdslinterfaces $vpninterfaces ; do
- if ! LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then
+ if ( . ./ifcfg-"$i" ; ! is_false "$ONBOOT" ) ; then
action $"Bringing up interface $i: " ./ifup $i boot
[ $? -ne 0 ] && rc=1
fi