diff options
| author | Ville Skyttä <ville.skytta@iki.fi> | 2009-12-19 16:03:10 +0200 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2010-01-12 16:40:46 -0500 |
| commit | b9bef01af3a42c87f213dfa825965e146b4b8966 (patch) | |
| tree | a992ed745c1e361d9fa040484d4f300e4992973c /rc.d | |
| parent | 43a7ec311b56f0ba6b06c3d35a53990869153ed5 (diff) | |
| download | initscripts-b9bef01af3a42c87f213dfa825965e146b4b8966.tar initscripts-b9bef01af3a42c87f213dfa825965e146b4b8966.tar.gz initscripts-b9bef01af3a42c87f213dfa825965e146b4b8966.tar.bz2 initscripts-b9bef01af3a42c87f213dfa825965e146b4b8966.tar.xz initscripts-b9bef01af3a42c87f213dfa825965e146b4b8966.zip | |
Get rid of uses of deprecated egrep and fgrep.
Diffstat (limited to 'rc.d')
| -rwxr-xr-x | rc.d/init.d/network | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/rc.d/init.d/network b/rc.d/init.d/network index d8d39089..52845ae3 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -98,9 +98,9 @@ case "$1" in # bring up all other interfaces configured to come up at boot time for i in $interfaces; do unset DEVICE TYPE SLAVE - eval $(LANG=C fgrep "DEVICE=" ifcfg-$i) - eval $(LANG=C fgrep "TYPE=" ifcfg-$i) - eval $(LANG=C fgrep "SLAVE=" ifcfg-$i) + eval $(LANG=C grep -F "DEVICE=" ifcfg-$i) + eval $(LANG=C grep -F "TYPE=" ifcfg-$i) + eval $(LANG=C grep -F "SLAVE=" ifcfg-$i) if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi @@ -131,7 +131,7 @@ case "$1" in continue fi - if LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then + if LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i > /dev/null ; then # this loads the module, to preserve ordering is_available $i continue @@ -147,7 +147,7 @@ case "$1" in # Bring up xDSL and VPN interfaces for i in $vlaninterfaces $bridgeinterfaces $xdslinterfaces $vpninterfaces ; do - if ! LANG=C egrep -L "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then + if ! LANG=C grep -EL "^ONBOOT=['\"]?[Nn][Oo]['\"]?" ifcfg-$i >/dev/null 2>&1 ; then # If we're in confirmation mode, get user confirmation. if [ -f /var/run/confirm ]; then confirm $i @@ -208,8 +208,8 @@ case "$1" in # get list of bonding, vpn, and xdsl interfaces for i in $interfaces; do unset DEVICE TYPE - eval $(LANG=C fgrep "DEVICE=" ifcfg-$i) - eval $(LANG=C fgrep "TYPE=" ifcfg-$i) + eval $(LANG=C grep -F "DEVICE=" ifcfg-$i) + eval $(LANG=C grep -F "TYPE=" ifcfg-$i) if [ -z "$DEVICE" ] ; then DEVICE="$i"; fi |