summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-01-12 20:17:31 +0000
committerBill Nottingham <notting@redhat.com>2005-01-12 20:17:31 +0000
commit606dac300fced32074bc994e62cea093c9b6e40a (patch)
treee675c9cf3e1af5f2252e3ad32fdb0266894a7b72
parent46c893c8f7516d1ad988c5596f4ddab2a49c13e2 (diff)
downloadinitscripts-606dac300fced32074bc994e62cea093c9b6e40a.tar.gz
initscripts-606dac300fced32074bc994e62cea093c9b6e40a.tar.xz
initscripts-606dac300fced32074bc994e62cea093c9b6e40a.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 ffe1d80a..5fd60dd7 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -72,7 +72,6 @@ if [ "${NETWORKING_IPV6}" = "yes" ]; then
fi
retcode=0
-if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
[ -n "`pidof -x dhcpcd`" ] && {
kill `cat /var/run/dhcpcd-${DEVICE}.pid`
retcode=$?
@@ -81,7 +80,6 @@ if [ "$BOOTPROTO" = bootp -o "$BOOTPROTO" = dhcp ]; then
pump -r -i ${DEVICE}
retcode=$?
}
-else
expand_config
# we can't just delete the configured address because that address
# may have been changed in the config file since the device was
@@ -92,7 +90,6 @@ else
else
ip addr flush dev ${REALDEVICE} label ${DEVICE} 2>/dev/null
fi
-fi
if [ "${REALDEVICE}" = "${DEVICE}" ]; then
ip link set ${DEVICE} down