From 1b9d3b70ea03346b9ffd4f024239f420ff61aaf8 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 26 Nov 2007 18:22:13 +0000 Subject: don't endlessly loop on ifdown if devices are inconsistent (#390271) --- sysconfig/network-scripts/ifdown-eth | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sysconfig/network-scripts/ifdown-eth') diff --git a/sysconfig/network-scripts/ifdown-eth b/sysconfig/network-scripts/ifdown-eth index 09ea71c2..4b2a926b 100755 --- a/sysconfig/network-scripts/ifdown-eth +++ b/sysconfig/network-scripts/ifdown-eth @@ -48,7 +48,8 @@ if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` if [ -n "${FOUNDMACADDR}" -a "${FOUNDMACADDR}" != "${HWADDR}" ]; then NEWCONFIG=`get_config_by_hwaddr ${FOUNDMACADDR}` - if [ -n "${NEWCONFIG}" -a "${NEWCONFIG##*/}" != "${CONFIG##*/}" ]; then +` eval $(LANG=C fgrep "DEVICE=" $NEWCONFIG) + if [ -n "${NEWCONFIG}" -a "${NEWCONFIG##*/}" != "${CONFIG##*/}" -a "${DEVICE}" = "${REALDEVICE}" ]; then exec /sbin/ifdown ${NEWCONFIG} else echo $"Device ${DEVICE} has MAC address ${FOUNDMACADDR}, instead of configured address ${HWADDR}. Ignoring." -- cgit v1.2.1