aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-01-12 20:16:58 +0000
committerBill Nottingham <notting@redhat.com>2005-01-12 20:16:58 +0000
commitb106d930e8824768652a609649e11bcdee688e4a (patch)
tree7b9c50c3885cff8bcf804aff1f6cf4f442f9cbd1
parent83429940e1c151add6fafcea3ef7e66a57a78105 (diff)
downloadinitscripts-b106d930e8824768652a609649e11bcdee688e4a.tar
initscripts-b106d930e8824768652a609649e11bcdee688e4a.tar.gz
initscripts-b106d930e8824768652a609649e11bcdee688e4a.tar.bz2
initscripts-b106d930e8824768652a609649e11bcdee688e4a.tar.xz
initscripts-b106d930e8824768652a609649e11bcdee688e4a.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 a7527e30..14e34436 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -67,7 +67,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
@@ -87,7 +86,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
@@ -97,7 +95,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