From 92f52745da8d05b705b8f611a1b2ec18083ac4b2 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Wed, 12 Jan 2005 20:14:25 +0000
Subject: kill dhcp client even if BOOTOPROTO is now static (#127726, others)

---
 sysconfig/network-scripts/ifdown | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'sysconfig/network-scripts')

diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 5bc8f5e8..db70f066 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -80,7 +80,6 @@ if [ "${NETWORKING_IPV6}" = "yes" ]; then
 fi;
 
 retcode=0
-if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
 	[ -n "`pidof -x dhclient`" ] && {
 		if [ -f "/var/run/dhclient-${DEVICE}.pid" ]; then
 		   if [[ "$DHCPRELEASE" = [yY1]* ]];  then
@@ -106,7 +105,6 @@ if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
 	 	pump -r -i ${DEVICE}
 		retcode=$?
 	}
-else
 	# we can't just delete the configured address because that address
 	# may have been changed in the config file since the device was
 	# brought up.  Flush all addresses associated with this
@@ -116,7 +114,6 @@ else
 	else
 		ip addr flush dev ${REALDEVICE} label ${DEVICE} 2>/dev/null
 	fi
-fi
 
 if [ "${REALDEVICE}" = "${DEVICE}" ]; then
   ip link set dev ${DEVICE} down
-- 
cgit v1.2.1