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:40:05 -0400
commit241944a67908d9afa32496ab6f7685d318c4cabc (patch)
tree4125994deeb2ee1cb0ad9e29ae1be5d537f11465
parent6e9b8917a277081e44a2b4dc8080ee7ca5328340 (diff)
downloadinitscripts-241944a67908d9afa32496ab6f7685d318c4cabc.tar
initscripts-241944a67908d9afa32496ab6f7685d318c4cabc.tar.gz
initscripts-241944a67908d9afa32496ab6f7685d318c4cabc.tar.bz2
initscripts-241944a67908d9afa32496ab6f7685d318c4cabc.tar.xz
initscripts-241944a67908d9afa32496ab6f7685d318c4cabc.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 e7491cd0..0f6e3600 100644
--- a/sysconfig/network-scripts/network-functions
+++ b/sysconfig/network-scripts/network-functions
@@ -36,8 +36,8 @@ get_config_by_hwaddr ()
get_config_by_subchannel ()
{
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-* \
+ "^[[: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"
}