diff options
author | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-02 10:14:29 +0000 |
---|---|---|
committer | Denis Vlasenko <vda.linux@googlemail.com> | 2007-08-02 10:14:29 +0000 |
commit | 1caca34aa67b2f267d0049d17e5430ca9c58ac3f (patch) | |
tree | b03a3218a2a96fa201bab6e7a58c9ad6b208c302 /networking | |
parent | fc77eb54e791c7d636c20993ec81396052af84f0 (diff) | |
download | busybox-w32-1caca34aa67b2f267d0049d17e5430ca9c58ac3f.tar.gz busybox-w32-1caca34aa67b2f267d0049d17e5430ca9c58ac3f.tar.bz2 busybox-w32-1caca34aa67b2f267d0049d17e5430ca9c58ac3f.zip |
start_stop_daemon: NOMMU fixes, round 2 by Alex Landau <landau_alex@yahoo.com>
dhcpc: fixed "ifupdown + udhcpc_without_pidpile_creation" bug
Diffstat (limited to 'networking')
-rw-r--r-- | networking/ifupdown.c | 4 | ||||
-rw-r--r-- | networking/udhcp/dhcpc.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/networking/ifupdown.c b/networking/ifupdown.c index a15e1411e..040bbe389 100644 --- a/networking/ifupdown.c +++ b/networking/ifupdown.c | |||
@@ -536,8 +536,8 @@ static int manual_up_down(struct interface_defn_t *ifd, execfn *exec) | |||
536 | static int bootp_up(struct interface_defn_t *ifd, execfn *exec) | 536 | static int bootp_up(struct interface_defn_t *ifd, execfn *exec) |
537 | { | 537 | { |
538 | return execute("bootpc[[ --bootfile %bootfile%]] --dev %iface%" | 538 | return execute("bootpc[[ --bootfile %bootfile%]] --dev %iface%" |
539 | "[[ --server %server%]][[ --hwaddr %hwaddr%]] " | 539 | "[[ --server %server%]][[ --hwaddr %hwaddr%]]" |
540 | "--returniffail --serverbcast", ifd, exec); | 540 | " --returniffail --serverbcast", ifd, exec); |
541 | } | 541 | } |
542 | 542 | ||
543 | static int ppp_up(struct interface_defn_t *ifd, execfn *exec) | 543 | static int ppp_up(struct interface_defn_t *ifd, execfn *exec) |
diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c index b84a6785a..4bb90c2da 100644 --- a/networking/udhcp/dhcpc.c +++ b/networking/udhcp/dhcpc.c | |||
@@ -11,6 +11,8 @@ | |||
11 | #include <getopt.h> | 11 | #include <getopt.h> |
12 | #include <syslog.h> | 12 | #include <syslog.h> |
13 | 13 | ||
14 | /* Override ENABLE_FEATURE_PIDFILE - ifupdown needs our pidfile to always exist */ | ||
15 | #define WANT_PIDFILE 1 | ||
14 | #include "common.h" | 16 | #include "common.h" |
15 | #include "dhcpd.h" | 17 | #include "dhcpd.h" |
16 | #include "dhcpc.h" | 18 | #include "dhcpc.h" |