diff options
| -rwxr-xr-x | rc.d/init.d/halt | 2 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/ifdown | 3 | ||||
| -rw-r--r-- | sysconfig/network-scripts/network-functions | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index d65fef40..857db62d 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -71,7 +71,7 @@ remaining=`awk '!/(^#|proc|loopfs|^none|^\/dev\/root| \/ )/ {print $2}' /proc/mo while [ -n "$remaining" -a "$retry" -gt 0 ] do if [ "$retry" -lt 3 ]; then - runcmd "Unmounting file systems" umount -a -f -t noproc + runcmd "Unmounting file systems (retry)" umount -a -f -t noproc else runcmd "Unmounting file systems" umount -a -f -t noproc fi diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown index 5018e708..a00c8949 100755 --- a/sysconfig/network-scripts/ifdown +++ b/sysconfig/network-scripts/ifdown @@ -36,6 +36,9 @@ if [ -x $OTHERSCRIPT ]; then exec $OTHERSCRIPT $CONFIG $2 fi +# Check to make sure the device is actually up +check_device_down && exit 0 + if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then pump -r -i ${DEVICE} fi diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions index d2b254d4..42fb72be 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions @@ -51,7 +51,7 @@ set_hostname() check_device_down () { - if ifconfig ${DEVICE} | grep UP >/dev/null 2>&1 ; then + if ifconfig ${DEVICE} 2>/dev/null | grep UP >/dev/null 2>&1 ; then retcode=1 else retcode=0 |