aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2011-01-12 12:18:13 -0500
committerHarald Hoyer <harald@redhat.com>2011-04-19 16:16:00 +0200
commit24d93df5be5d6536addafe4cf598db1935c96063 (patch)
tree63160c6580371aa6a2153cebe934c0b9dc93f9da
parent9d8ed9b55eb5295fc3b446b37d2cabcd739ab431 (diff)
downloadinitscripts-24d93df5be5d6536addafe4cf598db1935c96063.tar
initscripts-24d93df5be5d6536addafe4cf598db1935c96063.tar.gz
initscripts-24d93df5be5d6536addafe4cf598db1935c96063.tar.bz2
initscripts-24d93df5be5d6536addafe4cf598db1935c96063.tar.xz
initscripts-24d93df5be5d6536addafe4cf598db1935c96063.zip
Handle 'MASTER' being quoted. (#651450, <gfidente@redhat.com>)
[Harald Hoyer <harald@redhat.com>: backport]
-rwxr-xr-xsysconfig/network-scripts/ifdown-eth2
-rwxr-xr-xsysconfig/network-scripts/ifup-eth2
2 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth
index f3d3c0f6..1ef0d442 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -47,7 +47,7 @@ fi
fi
if is_bonding_device ${DEVICE} ; then
- for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
+ for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?" /etc/sysconfig/network-scripts/ifcfg-*) ; do
is_ignored_file "$device" && continue
/sbin/ifdown ${device##*/}
done
diff --git a/sysconfig/network-scripts/ifup-eth b/sysconfig/network-scripts/ifup-eth
index b3628e77..3e5f199f 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -135,7 +135,7 @@ if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then
/sbin/ip link set dev ${DEVICE} up
[ -n "${LINKDELAY}" ] && /bin/sleep ${LINKDELAY}
- for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do
+ for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?" /etc/sysconfig/network-scripts/ifcfg-*) ; do
is_ignored_file "$device" && continue
/sbin/ifup ${device##*/}
done