diff options
| author | Bill Nottingham <notting@redhat.com> | 2011-01-12 12:18:13 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2011-01-12 12:18:52 -0500 |
| commit | c95a09415d01f61b45d908c292398ad1ffee54fd (patch) | |
| tree | de3b15d430d8bf25b71ce92264aa82394f2ae33e | |
| parent | 6831dcb405dc3b76cc38ced167b2bc6c54149e7d (diff) | |
| download | initscripts-c95a09415d01f61b45d908c292398ad1ffee54fd.tar initscripts-c95a09415d01f61b45d908c292398ad1ffee54fd.tar.gz initscripts-c95a09415d01f61b45d908c292398ad1ffee54fd.tar.bz2 initscripts-c95a09415d01f61b45d908c292398ad1ffee54fd.tar.xz initscripts-c95a09415d01f61b45d908c292398ad1ffee54fd.zip | |
Handle 'MASTER' being quoted. (#651450, <gfidente@redhat.com>)
| -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 19fc1f12..530975c3 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 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 cae00783..a7d41abe 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -129,7 +129,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 |