diff options
| author | Bill Nottingham <notting@redhat.com> | 2005-01-12 20:57:19 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2005-01-12 20:57:19 +0000 |
| commit | 25f7d7fc6ae84bc15b47ae51d97aea5b99ad995f (patch) | |
| tree | 0a9d65b7f931fd65f1b30e4532c18a8cefdd4465 | |
| parent | 2bdcdcd41e3c9145073a74b08aae898984018051 (diff) | |
| download | initscripts-25f7d7fc6ae84bc15b47ae51d97aea5b99ad995f.tar initscripts-25f7d7fc6ae84bc15b47ae51d97aea5b99ad995f.tar.gz initscripts-25f7d7fc6ae84bc15b47ae51d97aea5b99ad995f.tar.bz2 initscripts-25f7d7fc6ae84bc15b47ae51d97aea5b99ad995f.tar.xz initscripts-25f7d7fc6ae84bc15b47ae51d97aea5b99ad995f.zip | |
fix various fgreps to not catch commented lines (#136531, expanded from <cww@redhat.com>)
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifup | 6 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index db70f066..88c9a9cf 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -61,7 +61,7 @@ check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "boot if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then - NEWCONFIG=`fgrep -il "HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*` + NEWCONFIG=`LANG=C grep -il "^[[:space:]]*HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*` if [ -n "${NEWCONFIG}" -a "${NEWCONFIG}" != "${CONFIG}" ]; then exec /sbin/ifdown ${NEWCONFIG} else diff --git a/sysconfig/network-scripts/ifup b/sysconfig/network-scripts/ifup index eecc3f8e..23686e5f 100755 --- a/sysconfig/network-scripts/ifup +++ b/sysconfig/network-scripts/ifup @@ -218,7 +218,7 @@ fi if [ "${TYPE}" = "Bonding" ] || ethtool -i $DEVICE 2>/dev/null| grep -q "driver: bonding" ; then /sbin/ip link set dev ${DEVICE} down /sbin/ip link set dev ${DEVICE} up - for device in `fgrep -l "MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do + for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do if [ "$BOOTPROTO" = "dhcp" ]; then /sbin/ifup ${device##*/} fi @@ -341,7 +341,7 @@ else fi # Bonding initialization part II if [ "${TYPE}" = "Bonding" ] || ethtool -i $DEVICE 2>/dev/null| grep -q "driver: bonding" ; then - for device in `fgrep -l "MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do + for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do /sbin/ifup ${device##*/} done fi @@ -414,7 +414,7 @@ fi # Bonding initialization part II - for static, enslave the devices. For # DHCP, remove any routes for the slaves. if [ "${TYPE}" = "Bonding" ] || ethtool -i $DEVICE 2>/dev/null| grep -q "driver: bonding" ; then - for device in `fgrep -l "MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do + for device in `LANG=C grep -l "^[[:space:]]*MASTER=${DEVICE}" /etc/sysconfig/network-scripts/ifcfg-*` ; do if [ "$BOOTPROTO" = "dhcp" ]; then DEV=$DEVICE eval $(LANG=C fgrep "DEVICE=" $device) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index eda9d3e1..68cac4d9 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -22,7 +22,7 @@ need_config () [ -f "${CONFIG}" ] && return local addr=`get_hwaddr ${1}` if [ -n "$addr" ]; then - local nconfig=`fgrep -il "HWADDR=$addr" /etc/sysconfig/network-scripts/ifcfg-*` + local nconfig=`LANG=C grep -il "^[[:space:]]*HWADDR=$addr" /etc/sysconfig/network-scripts/ifcfg-*` if [ -n "$nconfig" ] ; then CONFIG=$nconfig [ -f "${CONFIG}" ] && return @@ -155,7 +155,7 @@ rename_device() { /sbin/nameif "$1" "$2" || { local hw2=`get_hwaddr ${1}` - local nconfig=`fgrep -il "HWADDR=$hw2" /etc/sysconfig/network-scripts/ifcfg-*` + local nconfig=`LANG=C grep -il "^[[:space:]]*HWADDR=$hw2" /etc/sysconfig/network-scripts/ifcfg-*` local dev= if [ -n "$nconfig" ]; then dev=$(. $nconfig ; echo $DEVICE) |