diff options
| author | Bill Nottingham <notting@redhat.com> | 2005-02-07 22:25:43 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2005-02-07 22:25:43 +0000 |
| commit | bff1a6c9aabcb9a454f00ef44296398a639edc42 (patch) | |
| tree | 41710cf420bf94a40071b99cb83549236f885f1c | |
| parent | faf07854be770ad94b0921ed6e5a43f1e19ad93e (diff) | |
| download | initscripts-bff1a6c9aabcb9a454f00ef44296398a639edc42.tar.gz initscripts-bff1a6c9aabcb9a454f00ef44296398a639edc42.tar.xz initscripts-bff1a6c9aabcb9a454f00ef44296398a639edc42.zip | |
handle being called on down devices better
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index d44f9f10..cc6f795e 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -60,9 +60,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." @@ -112,7 +112,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=$? |