summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2004-07-26 12:05:44 +0000
committerEric Andersen2004-07-26 12:05:44 +0000
commitac594257c34c12a2ca1b8e766c5f575ed2b05f5a (patch)
tree9fe6e86e3a978584ebc5303c2c48d360d777b84c
parent882cec3e40af63d1866cab7b1ce322d70f94c7df (diff)
downloadbusybox-ac594257c34c12a2ca1b8e766c5f575ed2b05f5a.zip
busybox-ac594257c34c12a2ca1b8e766c5f575ed2b05f5a.tar.gz
Make certain that udhcp shuts down the interface
-rw-r--r--networking/ifupdown.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 95d78ea..276ca5f 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -565,7 +565,7 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
int result = 0;
if (execable("/sbin/udhcpc")) {
execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
- execute("kill -9 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+ execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
} else if (execable("/sbin/pump")) {
result = execute("pump -i %iface% -k", ifd, exec);
} else if (execable("/sbin/dhclient")) {
@@ -573,7 +573,6 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
} else if (execable("/sbin/dhcpcd")) {
result = execute("dhcpcd -k %iface%", ifd, exec);
}
- static_down(ifd, exec);
return (result || bootp_down(ifd, exec));
}