From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 26 Jul 2004 12:05:44 +0000 (-0000)
Subject: Make certain that udhcp shuts down the interface
X-Git-Tag: 1_00_rc2~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=ac594257c34c12a2ca1b8e766c5f575ed2b05f5a;p=oweals%2Fbusybox.git

Make certain that udhcp shuts down the interface
---

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 95d78ea46..276ca5f22 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));
 }