From e07b340f337d8c03410921166b182e854f684299 Mon Sep 17 00:00:00 2001
From: Preston Brown <pbrown@redhat.com>
Date: Thu, 27 Jun 2002 17:30:09 +0000
Subject: move device down checking higher up, and clarify.

---
 sysconfig/network-scripts/ifdown | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'sysconfig/network-scripts/ifdown')

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 9f07eb6f..7d0d09ec 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -31,6 +31,11 @@ fi
 
 source_config
 
+# Check to make sure the device is actually up.
+# we still run the script if the device is down and it was configured
+# with DHCP or BOOTP, to insure dhcp/bootp dies.
+check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "bootp" ] && exit 0
+
 if [ -x /sbin/ifdown-pre-local ]; then
     /sbin/ifdown-pre-local ${DEVICE}
 fi
@@ -45,9 +50,6 @@ fi
 
 . /etc/sysconfig/network
 
-# Check to make sure the device is actually up
-check_device_down ${DEVICE} && [ "$BOOTPROTO" != "dhcp" -a "$BOOTPROTO" != "bootp" ] && exit 0
-
 if [ -n "${HWADDR}" ]; then
     FOUNDMACADDR=`LC_ALL= LANG= ip -o link show ${REALDEVICE} | \
 	sed 's/.*link\/ether \([[:alnum:]:]*\).*/\1/'`
-- 
cgit v1.2.1