From 7409e1177b7c6681f9024b610c6cf72a88b46904 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Mon, 7 Feb 2005 22:26:11 +0000 Subject: handle being called on down devices better --- sysconfig/network-scripts/ifdown | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index a2f17b31..3b97a4c6 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -51,9 +51,9 @@ check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "boot if [ -n "${HWADDR}" -a -z "${MACADDR}" ]; then FOUNDMACADDR=`get_hwaddr ${REALDEVICE}` - if [ "${FOUNDMACADDR}" != "${HWADDR}" ]; then + if [ -n "${FOUNDMACADDR}" -a "${FOUNDMACADDR}" != "${HWADDR}" ]; then NEWCONFIG=`LANG=C grep -il "^[[:space:]]*HWADDR=${HWADDR}" /etc/sysconfig/network-scripts/ifcfg-*` - if [ -n "${NEWCONFIG}" -a "${NEWCONFIG}" != "${CONFIG}" ]; then + if [ -n "${NEWCONFIG}" -a "${NEWCONFIG##*/}" != "${CONFIG##*/}" ]; then exec /sbin/ifdown ${NEWCONFIG} else echo $"Device ${DEVICE} has different MAC address than expected, ignoring." @@ -99,7 +99,7 @@ if ! [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then fi if [ "${REALDEVICE}" = "${DEVICE}" ]; then - ip link set dev ${DEVICE} down + ip link set dev ${DEVICE} down 2>/dev/null fi [ "$retcode" = "0" ] && retcode=$? -- cgit v1.2.1