dcavalca / rpms / initscripts

Forked from rpms/initscripts 4 years ago
Clone
Blob Blame History Raw
From 55ee446c0715b013e6d54860ae65e55baf544dc3 Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Tue, 8 Jan 2019 17:23:13 +0100
Subject: [PATCH] Replace grep -EL with subshell since -L changed behaviour

Sugested by @lnykryn
Related to issue #300
---
 etc/rc.d/init.d/network | 4 ++--
 1 file 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