summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-01-12 20:16:07 +0000
committerBill Nottingham <notting@redhat.com>2005-01-12 20:16:07 +0000
commitcdd54e4fb8c44ab9dbff72d309c49655427c2022 (patch)
tree84e4dff552c2d7d081955d291e0c40ddbade5609
parent21eee82aea45112ec78ad42f59b9d258687991ca (diff)
downloadinitscripts-cdd54e4fb8c44ab9dbff72d309c49655427c2022.tar.gz
initscripts-cdd54e4fb8c44ab9dbff72d309c49655427c2022.tar.xz
initscripts-cdd54e4fb8c44ab9dbff72d309c49655427c2022.zip
kill dhcp client even if BOOTOPROTO is now static (#127726, others)
-rwxr-xr-xsysconfig/network-scripts/ifdown3
1 files changed, 0 insertions, 3 deletions
diff --git a/sysconfig/network-scripts/ifdown b/sysconfig/network-scripts/ifdown
index 16954b4d..015bb90d 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
kill `cat /var/run/dhclient-${DEVICE}.pid` >/dev/null 2>&1
@@ -100,7 +99,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
@@ -110,7 +108,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