diff options
| author | bug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-07-21 12:21:39 +0000 |
|---|---|---|
| committer | bug1 <bug1@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2004-07-21 12:21:39 +0000 |
| commit | 2e3b94de169d294f00ee77f3c3cb97cd85a04685 (patch) | |
| tree | 3f167bc0b8dae75398245e197ac09e1917bbc5e0 | |
| parent | 75c53ccd61532a2467c281a3780b712b4d70f58f (diff) | |
| download | busybox-w32-2e3b94de169d294f00ee77f3c3cb97cd85a04685.tar.gz busybox-w32-2e3b94de169d294f00ee77f3c3cb97cd85a04685.tar.bz2 busybox-w32-2e3b94de169d294f00ee77f3c3cb97cd85a04685.zip | |
Patch from Mike Snitzer, bring down dhclient using its correct pid, fix
a grammatical error.
git-svn-id: svn://busybox.net/trunk/busybox@8992 69ca8d6d-28ef-0310-b511-8ec308f3f277
| -rw-r--r-- | networking/ifupdown.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index 5809380af..5d7442253 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
| @@ -562,7 +562,7 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec) | |||
| 562 | } else if (execable("/sbin/pump")) { | 562 | } else if (execable("/sbin/pump")) { |
| 563 | result = execute("pump -i %iface% -k", ifd, exec); | 563 | result = execute("pump -i %iface% -k", ifd, exec); |
| 564 | } else if (execable("/sbin/dhclient")) { | 564 | } else if (execable("/sbin/dhclient")) { |
| 565 | execute("kill -9 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec); | 565 | execute("kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null", ifd, exec); |
| 566 | } else if (execable("/sbin/dhcpcd")) { | 566 | } else if (execable("/sbin/dhcpcd")) { |
| 567 | result = execute("dhcpcd -k %iface%", ifd, exec); | 567 | result = execute("dhcpcd -k %iface%", ifd, exec); |
| 568 | } | 568 | } |
| @@ -1375,7 +1375,7 @@ extern int ifupdown_main(int argc, char **argv) | |||
| 1375 | 1375 | ||
| 1376 | /* Call the cmds function pointer, does either iface_up() or iface_down() */ | 1376 | /* Call the cmds function pointer, does either iface_up() or iface_down() */ |
| 1377 | if (cmds(currif) == -1) { | 1377 | if (cmds(currif) == -1) { |
| 1378 | bb_error_msg("Don't seem to be have all the variables for %s/%s.", | 1378 | bb_error_msg("Don't seem to have all the variables for %s/%s.", |
| 1379 | liface, currif->address_family->name); | 1379 | liface, currif->address_family->name); |
| 1380 | } | 1380 | } |
| 1381 | 1381 | ||
