[BusyBox-cvs] CVS update of busybox/networking (ifupdown.c)

[Erik Andersen]

    Date: Monday, July 26, 2004 @ 05:45:26
  Author: andersen
    Path: /var/cvs/busybox/networking

Modified: ifupdown.c (1.43 -> 1.44)

Make certain that udhcp shuts down the interface


Index: busybox/networking/ifupdown.c
diff -u busybox/networking/ifupdown.c:1.43 busybox/networking/ifupdown.c:1.44
--- busybox/networking/ifupdown.c:1.43	Thu Jul 22 19:10:22 2004
+++ busybox/networking/ifupdown.c	Mon Jul 26 05:45:25 2004
@@ -565,7 +565,7 @@
 	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 @@
 	} else if (execable("/sbin/dhcpcd")) {
 		result = execute("dhcpcd -k %iface%", ifd, exec);
 	}
+	static_down(ifd, exec)
 	return (result || bootp_down(ifd, exec));
 }