aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-01-12 20:14:25 +0000
committerBill Nottingham <notting@redhat.com>2005-01-12 20:14:25 +0000
commit92f52745da8d05b705b8f611a1b2ec18083ac4b2 (patch)
tree3448c647946fa30329a571d159bfe720f414a15b
parent3997a261ac3754b51241275505b6ae5e5b009ed7 (diff)
downloadinitscripts-92f52745da8d05b705b8f611a1b2ec18083ac4b2.tar
initscripts-92f52745da8d05b705b8f611a1b2ec18083ac4b2.tar.gz
initscripts-92f52745da8d05b705b8f611a1b2ec18083ac4b2.tar.bz2
initscripts-92f52745da8d05b705b8f611a1b2ec18083ac4b2.tar.xz
initscripts-92f52745da8d05b705b8f611a1b2ec18083ac4b2.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 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