diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2013-02-26 16:57:05 +0100 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2013-02-26 16:57:05 +0100 |
| commit | 08ae592f83dfa9c6e83d42f0d6e20543c253a685 (patch) | |
| tree | b7998d5f25fdd3a34fa686afd6d4e17aee201484 /sysconfig/network-scripts | |
| parent | 56f31196ccdcb79fc105b2ada4078e05f5c5b3fb (diff) | |
| download | initscripts-08ae592f83dfa9c6e83d42f0d6e20543c253a685.tar initscripts-08ae592f83dfa9c6e83d42f0d6e20543c253a685.tar.gz initscripts-08ae592f83dfa9c6e83d42f0d6e20543c253a685.tar.bz2 initscripts-08ae592f83dfa9c6e83d42f0d6e20543c253a685.tar.xz initscripts-08ae592f83dfa9c6e83d42f0d6e20543c253a685.zip | |
Fix greps to correctly handle comments and quotation
Diffstat (limited to 'sysconfig/network-scripts')
| -rwxr-xr-x | sysconfig/network-scripts/ifdown-eth | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup-eth | 2 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index c3aa789c..3d6d791e 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}\"?[[:space:]]*$" /etc/sysconfig/network-scripts/ifcfg-*) ; do + for device in $(LANG=C grep -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 a7add8a9..56169eca 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -114,7 +114,7 @@ fi # so it can actually get an IP. if [ "$ISALIAS" = no ] && is_bonding_device ${DEVICE} ; then install_bonding_driver ${DEVICE} - for device in $(LANG=C egrep -l "^[[:space:]]*MASTER=\"?${DEVICE}\"?[[:space:]]*$" /etc/sysconfig/network-scripts/ifcfg-*) ; do + for device in $(LANG=C grep -l "^[[:space:]]*MASTER=\"\?${DEVICE}\"\?\([[:space:]#]\|$\)" /etc/sysconfig/network-scripts/ifcfg-*) ; do is_ignored_file "$device" && continue /sbin/ifup ${device##*/} done diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index dd968f0b..bbfa35b0 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -22,7 +22,7 @@ get_hwaddr () get_config_by_device () { - LANG=C grep -l "^[[:space:]]*DEVICE=${1}\([[:space:]#]\|$\)" \ + LANG=C grep -l "^[[:space:]]*DEVICE=\"\?${1}\"\?\([[:space:]#]\|$\)" \ /etc/sysconfig/network-scripts/ifcfg-* \ | LC_ALL=C sed -e "$__sed_discard_ignored_files" } |