aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2010-06-24 13:40:05 -0400
committerBill Nottingham <notting@redhat.com>2010-06-24 13:43:22 -0400
commit105ddc7cdc9ebe1b3f1f6f6eead2ad0193418ccb (patch)
treec4c465ecdbffa666a39ac6e4138568591bb1dddf
parent6709e3dd4c0ba73fd698897f75992a9d50c74070 (diff)
downloadinitscripts-105ddc7cdc9ebe1b3f1f6f6eead2ad0193418ccb.tar
initscripts-105ddc7cdc9ebe1b3f1f6f6eead2ad0193418ccb.tar.gz
initscripts-105ddc7cdc9ebe1b3f1f6f6eead2ad0193418ccb.tar.bz2
initscripts-105ddc7cdc9ebe1b3f1f6f6eead2ad0193418ccb.tar.xz
initscripts-105ddc7cdc9ebe1b3f1f6f6eead2ad0193418ccb.zip
Handle quoted SUBCHANNELS (#607481)
-rw-r--r--sysconfig/network-scripts/network-functions4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions
index 4790875e..c609b224 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -35,8 +35,8 @@ get_config_by_hwaddr ()
get_config_by_subchannel ()
{
- LANG=C egrep -i -l \
- "^[[:space:]]*SUBCHANNELS=([0-9]\.[0-9]\.[a-f0-9]+,){0,2}${1}(,[0-9]\.[0-9]\.[a-f0-9]+){0,2}([[:space:]]+#|[[:space:]]*$)" \
+ LANG=C grep -E -i -l \
+ "^[[:space:]]*SUBCHANNELS=['\"]?([0-9]\.[0-9]\.[a-f0-9]+,){0,2}${1}(,[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"
}