diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-11-21 10:04:18 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-11-21 10:04:18 -0500 |
| commit | c9ef1f45fae04b7342bcdcf5dc95d8ede97a7cff (patch) | |
| tree | 81011bad806633dac1910da0e59c196a157034c3 | |
| parent | 5787421b9c08f21bb2747761e43b32a19678d8c2 (diff) | |
| parent | 24f6eb1dff31addf3fb2e0361dd34abf37c75cf2 (diff) | |
| download | initscripts-c9ef1f45fae04b7342bcdcf5dc95d8ede97a7cff.tar initscripts-c9ef1f45fae04b7342bcdcf5dc95d8ede97a7cff.tar.gz initscripts-c9ef1f45fae04b7342bcdcf5dc95d8ede97a7cff.tar.bz2 initscripts-c9ef1f45fae04b7342bcdcf5dc95d8ede97a7cff.tar.xz initscripts-c9ef1f45fae04b7342bcdcf5dc95d8ede97a7cff.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/initscripts
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index 90eaf740..1e0aecb4 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -28,7 +28,9 @@ get_config_by_hwaddr () get_config_by_subchannel () { - LANG=C egrep -l "^[[:space:]]*SUBCHANNELS=([0-9]+,){0,2}${1}(,[0-9]+){0,2}([[:space:]]+#|[[:space:]]*$)" /etc/sysconfig/network-scripts/ifcfg-* \ + LANG=C egrep -i -l \ + "^[[:space:]]*SUBCHANNELS=([0-9]\.[0-9]\.[a-f0-9]+,){0,2}${t}(,[0-9]\.[0-9]\.[a-f0-9]+){0,2}([[:space:]]+#|[[:space:]]*$)" \ + /etc/sysconfig/network-scripts/ifcfg-* \ | LC_ALL=C sed -e "$__sed_discard_ignored_files" } |