aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2012-05-23 13:28:23 -0400
committerBill Nottingham <notting@redhat.com>2012-05-23 13:29:02 -0400
commit3b5cf5777050f62e772b23dc15bf7948db2e3d99 (patch)
treeda13597d74bc07c1b3fca6e8aeccebfe1b95dee5
parentf050aa1d898ed6328c6b1baf8309dd840694a3ff (diff)
downloadinitscripts-3b5cf5777050f62e772b23dc15bf7948db2e3d99.tar
initscripts-3b5cf5777050f62e772b23dc15bf7948db2e3d99.tar.gz
initscripts-3b5cf5777050f62e772b23dc15bf7948db2e3d99.tar.bz2
initscripts-3b5cf5777050f62e772b23dc15bf7948db2e3d99.tar.xz
initscripts-3b5cf5777050f62e772b23dc15bf7948db2e3d99.zip
Don't accidentally match other bonding devices. (#824175)
-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 e120af76..d7eb6370 100755
--- a/sysconfig/network-scripts/ifdown-eth
+++ b/sysconfig/network-scripts/ifdown-eth
@@ -53,7 +53,7 @@ fi
fi
if is_bonding_device ${DEVICE} ; then
- for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?" /etc/sysconfig/network-scripts/ifcfg-*) ; do
+ for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?[[:space:]]*$" /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 9d926f23..aaa66cc8 100755
--- a/sysconfig/network-scripts/ifup-eth
+++ b/sysconfig/network-scripts/ifup-eth
@@ -140,7 +140,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 egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?" /etc/sysconfig/network-scripts/ifcfg-*) ; do
+ for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?[[:space:]]*$" /etc/sysconfig/network-scripts/ifcfg-*) ; do
is_ignored_file "$device" && continue
/sbin/ifup ${device##*/}
done