From ac594257c34c12a2ca1b8e766c5f575ed2b05f5a Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Mon, 26 Jul 2004 12:05:44 +0000 Subject: Make certain that udhcp shuts down the interface --- networking/ifupdown.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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)); } -- cgit v1.2.3