summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Andersen2004-07-26 11:45:25 +0000
committerEric Andersen2004-07-26 11:45:25 +0000
commit06e62fd5f0cf519d179acf3e24a6e3ca06dc87f5 (patch)
tree6e8863ec733142a3b904e7533296b14808f9fe90
parent380919905cd689f0d295abb4f10468b3144a83ce (diff)
downloadbusybox-06e62fd5f0cf519d179acf3e24a6e3ca06dc87f5.zip
busybox-06e62fd5f0cf519d179acf3e24a6e3ca06dc87f5.tar.gz
Make certain that udhcp shuts down the interface
-rw-r--r--networking/ifupdown.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 276ca5f..ff6e58a 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 -TERM `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);
} else if (execable("/sbin/pump")) {
result = execute("pump -i %iface% -k", ifd, exec);
} else if (execable("/sbin/dhclient")) {
@@ -573,6 +573,7 @@ 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));
}