diff options
author | Bill Nottingham <notting@redhat.com> | 2012-05-23 13:28:23 -0400 |
---|---|---|
committer | Lukas Nykryn <lnykryn@redhat.com> | 2012-08-03 10:53:39 +0200 |
commit | f718936169f4385d844c9415de45e5009381170f (patch) | |
tree | 49d8b1eba55e5c98ac94301c98775a0ad6f1a0f7 | |
parent | e554983ef261a0d45ddd20bd23caf47106d3773c (diff) | |
download | initscripts-f718936169f4385d844c9415de45e5009381170f.tar initscripts-f718936169f4385d844c9415de45e5009381170f.tar.gz initscripts-f718936169f4385d844c9415de45e5009381170f.tar.bz2 initscripts-f718936169f4385d844c9415de45e5009381170f.tar.xz initscripts-f718936169f4385d844c9415de45e5009381170f.zip |
Don't accidentally match other bonding devices. (#824175)
-rwxr-xr-x | sysconfig/network-scripts/ifdown-eth | 2 | ||||
-rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 19105f34..e61bfaba 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 133fbef4..d3adb143 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -139,7 +139,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 |