diff options
| author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-07-26 12:05:44 +0000 |
|---|---|---|
| committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-07-26 12:05:44 +0000 |
| commit | 464221ab85fb7f23930fbad6106651122c11099e (patch) | |
| tree | 9fe6e86e3a978584ebc5303c2c48d360d777b84c | |
| parent | 13750000e2b654fc6716c1f75be05846e1874f99 (diff) | |
| download | busybox-w32-464221ab85fb7f23930fbad6106651122c11099e.tar.gz busybox-w32-464221ab85fb7f23930fbad6106651122c11099e.tar.bz2 busybox-w32-464221ab85fb7f23930fbad6106651122c11099e.zip | |
Make certain that udhcp shuts down the interface
git-svn-id: svn://busybox.net/trunk/busybox@9021 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | networking/ifupdown.c | 3 |
1 files changed, 1 insertions, 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) | |||
| 565 | int result = 0; | 565 | int result = 0; |
| 566 | if (execable("/sbin/udhcpc")) { | 566 | if (execable("/sbin/udhcpc")) { |
| 567 | execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); | 567 | execute("kill -USR2 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); |
| 568 | execute("kill -9 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); | 568 | execute("kill -TERM `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); |
| 569 | } else if (execable("/sbin/pump")) { | 569 | } else if (execable("/sbin/pump")) { |
| 570 | result = execute("pump -i %iface% -k", ifd, exec); | 570 | result = execute("pump -i %iface% -k", ifd, exec); |
| 571 | } else if (execable("/sbin/dhclient")) { | 571 | } else if (execable("/sbin/dhclient")) { |
| @@ -573,7 +573,6 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) | |||
| 573 | } else if (execable("/sbin/dhcpcd")) { | 573 | } else if (execable("/sbin/dhcpcd")) { |
| 574 | result = execute("dhcpcd -k %iface%", ifd, exec); | 574 | result = execute("dhcpcd -k %iface%", ifd, exec); |
| 575 | } | 575 | } |
| 576 | static_down(ifd, exec); | ||
| 577 | return (result || bootp_down(ifd, exec)); | 576 | return (result || bootp_down(ifd, exec)); |
| 578 | } | 577 | } |
| 579 | 578 | ||