diff options
| author | Bill Nottingham <notting@redhat.com> | 2012-05-23 13:28:23 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2012-05-23 13:28:23 -0400 |
| commit | 890544a5cbee7482962194e1e8bfb478aa39d8a5 (patch) | |
| tree | bfa3dbdf1d252105bddb8688a83f195e454fae32 | |
| parent | 332eb6c6a4c10f7fd961d6f8d6cc91a0bf058de7 (diff) | |
| download | initscripts-890544a5cbee7482962194e1e8bfb478aa39d8a5.tar initscripts-890544a5cbee7482962194e1e8bfb478aa39d8a5.tar.gz initscripts-890544a5cbee7482962194e1e8bfb478aa39d8a5.tar.bz2 initscripts-890544a5cbee7482962194e1e8bfb478aa39d8a5.tar.xz initscripts-890544a5cbee7482962194e1e8bfb478aa39d8a5.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 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 a43d04e7..afea2372 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 |