From 60899ae51bf662d92c8effe66ebe263117fd977a Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 9 Jun 2005 18:46:57 +0000 Subject: fix grep to always match the full hwaddr, as opposed to matching '0' against '00:AA:BB:CC:DD:EE'. Take into account lines that end with spaces, or with "# this is a comment", too. Also, put the grep in only one place instead of 3. Fixes #157252, #153669. --- sysconfig/network-scripts/ifdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sysconfig/network-scripts/ifdown') diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index 4242baab..b02fb5c6 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -52,7 +52,7 @@ check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "boot if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` if [ -n "${FOUNDMACADDR}" -a "${FOUNDMACADDR}" != "${HWADDR}" ]; then - NEWCONFIG=`LANG=C grep -il "^[[:space:]]*HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*` + NEWCONFIG=`get_config_by_hwaddr ${FOUNDMACADDR}` if [ -n "${NEWCONFIG}" -a "${NEWCONFIG##*/}" != "${CONFIG##*/}" ]; then exec /sbin/ifdown ${NEWCONFIG} else -- cgit v1.2.1