aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2002-06-27 18:31:54 +0000
committerBill Nottingham <notting@redhat.com>2002-06-27 18:31:54 +0000
commit9ace2daa2b2e8985e49793bf7eef56f86ab4eaad (patch)
treebc879ba8d2ef34cac174ae3736de208209c9564e
parente1fb16471a6ed1a97d2c9600e8622f36828ae1d4 (diff)
downloadinitscripts-9ace2daa2b2e8985e49793bf7eef56f86ab4eaad.tar
initscripts-9ace2daa2b2e8985e49793bf7eef56f86ab4eaad.tar.gz
initscripts-9ace2daa2b2e8985e49793bf7eef56f86ab4eaad.tar.bz2
initscripts-9ace2daa2b2e8985e49793bf7eef56f86ab4eaad.tar.xz
initscripts-9ace2daa2b2e8985e49793bf7eef56f86ab4eaad.zip
switch back; we still want to run ifdown-ppp, etc.
-rwxr-xr-xsysconfig/network-scripts/ifdown8
1 files changed, 3 insertions, 5 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 7d0d09ec..9f07eb6f 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -31,11 +31,6 @@ 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
@@ -50,6 +45,9 @@ 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/'`