From a3761f9b1480fb6bcd6710600c0056cef721ebcc Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 8 Mar 2000 16:20:36 +0000
Subject: check that a device is up before bringing it down

---
 sysconfig/network-scripts/ifdown            | 3 +++
 sysconfig/network-scripts/network-functions | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'sysconfig')

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
-- 
cgit v1.2.1