aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-01-12 20:16:35 +0000
committerBill Nottingham <notting@redhat.com>2005-01-12 20:16:35 +0000
commit3d285ca1265f49b7fe58fc2234b517604f955c94 (patch)
treeca6ce2009de5165ac418acabd5522f8adb3983a7
parentb099353ec9bbca20d938b8dfb09198e9e89a6b91 (diff)
downloadinitscripts-3d285ca1265f49b7fe58fc2234b517604f955c94.tar
initscripts-3d285ca1265f49b7fe58fc2234b517604f955c94.tar.gz
initscripts-3d285ca1265f49b7fe58fc2234b517604f955c94.tar.bz2
initscripts-3d285ca1265f49b7fe58fc2234b517604f955c94.tar.xz
initscripts-3d285ca1265f49b7fe58fc2234b517604f955c94.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 0c3c1247..bfc04860 100755
--- a/sysconfig/network-scripts/ifdown
+++ b/sysconfig/network-scripts/ifdown
@@ -76,7 +76,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
@@ -96,7 +95,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
@@ -106,7 +104,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