summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn L McGrath2004-07-21 12:21:39 +0000
committerGlenn L McGrath2004-07-21 12:21:39 +0000
commit469a1ead538f928c131fb68fe82c8578138248c6 (patch)
tree3f167bc0b8dae75398245e197ac09e1917bbc5e0
parent28939ade2dbfdf5e970ed66a79f2a004ac8eb4b4 (diff)
downloadbusybox-469a1ead538f928c131fb68fe82c8578138248c6.zip
busybox-469a1ead538f928c131fb68fe82c8578138248c6.tar.gz
Patch from Mike Snitzer, bring down dhclient using its correct pid, fix
a grammatical error.
-rw-r--r--networking/ifupdown.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 5809380..5d74422 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -562,7 +562,7 @@ static int dhcp_down(struct interface_defn_t *ifd, execfn *exec)
} else if (execable("/sbin/pump")) {
result = execute("pump -i %iface% -k", ifd, exec);
} else if (execable("/sbin/dhclient")) {
- execute("kill -9 `cat /var/run/udhcpc.%iface%.pid` 2>/dev/null", ifd, exec);
+ execute("kill -9 `cat /var/run/dhclient.%iface%.pid` 2>/dev/null", ifd, exec);
} else if (execable("/sbin/dhcpcd")) {
result = execute("dhcpcd -k %iface%", ifd, exec);
}
@@ -1375,7 +1375,7 @@ extern int ifupdown_main(int argc, char **argv)
/* Call the cmds function pointer, does either iface_up() or iface_down() */
if (cmds(currif) == -1) {
- bb_error_msg("Don't seem to be have all the variables for %s/%s.",
+ bb_error_msg("Don't seem to have all the variables for %s/%s.",
liface, currif->address_family->name);
}