diff options
| author | Glenn L McGrath <bug1@ihug.co.nz> | 2004-03-05 13:11:05 +0000 |
|---|---|---|
| committer | Glenn L McGrath <bug1@ihug.co.nz> | 2004-03-05 13:11:05 +0000 |
| commit | bd5d84ddca87d55dde46d37e253a211d8a12267a (patch) | |
| tree | 6681e65dd510d49aa492b8a4166a72625e47a171 /patches | |
| parent | fbe984e1c9b039e68e57848e8d2fe843777ef5a6 (diff) | |
| download | busybox-bd5d84ddca87d55dde46d37e253a211d8a12267a.tar.gz | |
Patch by Denis Vlasenko to add forground support.
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/udhcpd_foreground.diff | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/patches/udhcpd_foreground.diff b/patches/udhcpd_foreground.diff new file mode 100644 index 000000000..9f1e3b913 --- /dev/null +++ b/patches/udhcpd_foreground.diff @@ -0,0 +1,33 @@ +Index: ./networking/udhcp/dhcpd.c +=================================================================== +RCS file: /var/cvs/busybox/networking/udhcp/dhcpd.c,v +retrieving revision 1.5 +diff -u -r1.5 dhcpd.c +--- a/./networking/udhcp/dhcpd.c 30 Jan 2004 23:45:12 -0000 1.5 ++++ b/./networking/udhcp/dhcpd.c 5 Mar 2004 13:09:05 -0000 +@@ -70,6 +70,13 @@ + struct dhcpOfferedAddr *lease; + int max_sock; + unsigned long num_ips; ++ int daemonize = 1; ++ ++ while (strcmp(argv[1],"-f")==0 || strcmp(argv[1],"--foreground")==0) { ++ daemonize = 0; ++ argv++; ++ argc--; ++ } + + memset(&server_config, 0, sizeof(struct server_config_t)); + read_config(argc < 2 ? DHCPD_CONF_FILE : argv[1]); +@@ -99,9 +106,8 @@ + &server_config.server, server_config.arp) < 0) + return 1; + +-#ifndef UDHCP_DEBUG +- background(server_config.pidfile); /* hold lock during fork. */ +-#endif ++ if(daemonize) ++ background(server_config.pidfile); /* hold lock during fork. */ + + /* Setup the signal pipe */ + udhcp_sp_setup(); |