diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2013-02-26 16:57:05 +0100 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2013-03-07 15:07:20 +0100 |
| commit | 740589f809e39647da417d976c2fed2ad75ce1dd (patch) | |
| tree | 9d37630545d0e846548750ec52a907e31359b350 /sysconfig/network-scripts | |
| parent | 984350346c9f075ee135e4c487b91bf818c185e8 (diff) | |
| download | initscripts-740589f809e39647da417d976c2fed2ad75ce1dd.tar initscripts-740589f809e39647da417d976c2fed2ad75ce1dd.tar.gz initscripts-740589f809e39647da417d976c2fed2ad75ce1dd.tar.bz2 initscripts-740589f809e39647da417d976c2fed2ad75ce1dd.tar.xz initscripts-740589f809e39647da417d976c2fed2ad75ce1dd.zip | |
Fix greps to correctly handle comments and quotation (#915659)
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 f256d572..4b1dad74 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 be225c85..f14f854d 100755 --- a/sysconfig/network-scripts/ifup-eth +++ b/sysconfig/network-scripts/ifup-eth @@ -119,7 +119,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 b15028b5..cb7c5403 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" } |