diff options
author | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-07-26 11:45:25 +0000 |
---|---|---|
committer | andersen <andersen@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-07-26 11:45:25 +0000 |
commit | 0578b999c4119906b9e4e479ed4f80527db60261 (patch) | |
tree | 6e8863ec733142a3b904e7533296b14808f9fe90 /networking/ifupdown.c | |
parent | 80d1d2727c3fafeda236d81b3aabf94f73da9d40 (diff) | |
download | busybox-w32-0578b999c4119906b9e4e479ed4f80527db60261.tar.gz busybox-w32-0578b999c4119906b9e4e479ed4f80527db60261.tar.bz2 busybox-w32-0578b999c4119906b9e4e479ed4f80527db60261.zip |
Make certain that udhcp shuts down the interface
git-svn-id: svn://busybox.net/trunk/busybox@9017 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to '')
-rw-r--r-- | networking/ifupdown.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 276ca5f22..ff6e58acd 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 -TERM `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); |
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,6 +573,7 @@ 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) | ||
576 | return (result || bootp_down(ifd, exec)); | 577 | return (result || bootp_down(ifd, exec)); |
577 | } | 578 | } |
578 | 579 | ||