diff options
| author | Bill Nottingham <notting@redhat.com> | 2005-01-12 21:03:36 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2005-01-12 21:03:36 +0000 |
| commit | 90f5bdd87fd86d0263e3a5f12f6e817da9d772e6 (patch) | |
| tree | 1ce2b4f5f29df883000662bf07faff810831866b /sysconfig/network-scripts/network-functions | |
| parent | 1b0806da445a6fa2f0674303155ccff8ec1413f1 (diff) | |
| download | initscripts-90f5bdd87fd86d0263e3a5f12f6e817da9d772e6.tar initscripts-90f5bdd87fd86d0263e3a5f12f6e817da9d772e6.tar.gz initscripts-90f5bdd87fd86d0263e3a5f12f6e817da9d772e6.tar.bz2 initscripts-90f5bdd87fd86d0263e3a5f12f6e817da9d772e6.tar.xz initscripts-90f5bdd87fd86d0263e3a5f12f6e817da9d772e6.zip | |
fix various fgreps to not catch commented lines (#136531, expanded from <cww@redhat.com>)
Diffstat (limited to 'sysconfig/network-scripts/network-functions')
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 64f2effd..249f224b 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 @@ -158,7 +158,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) |