From f36c6214a1c0591a1aa7a4f45e3ede305ad0c555 Mon Sep 17 00:00:00 2001 From: Jan Macku Date: Tue, 16 Jun 2020 09:21:48 +0200 Subject: Replace grep -EL with subshell since -L changed behaviour Option -L is not supported in grep 3.2+ Related to #rhbz1824324 ----------- Sugested by @lnykryn Related to issue #300 (cherry picked from commit 04bb81ecfef80477a6bfa5b7598f27f5ad53f86e) --- etc/rc.d/init.d/network | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'etc/rc.d/init.d') diff --git a/etc/rc.d/init.d/network b/etc/rc.d/init.d/network index 45632cc9..9e3cfbff 100755 --- a/etc/rc.d/init.d/network +++ b/etc/rc.d/init.d/network @@ -128,7 +128,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 @@ -139,7 +139,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 -- cgit v1.2.1