From: Roy Marples <roy@marples.name>
Date: Tue, 29 Jul 2008 16:09:56 +0000 (+0000)
Subject: Fix background for forkless systems.
X-Git-Tag: v4.0.2~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1e3374e9841aab38b557b7f7f835bb775446028e;p=thirdparty%2Fdhcpcd.git

Fix background for forkless systems.
---

diff --git a/client.c b/client.c
index 371170f7..024ac3b6 100644
--- a/client.c
+++ b/client.c
@@ -505,7 +505,8 @@ client_setup(struct if_state *state, const struct options *options)
 	if (options->request_address.s_addr == 0 &&
 	    (options->options & DHCPCD_INFORM ||
 	     options->options & DHCPCD_REQUEST ||
-	     options->options & DHCPCD_DAEMONISED))
+	     (options->options & DHCPCD_DAEMONISED &&
+	      !(options->options & DHCPCD_BACKGROUND))))
 	{
 		if (get_old_lease(state) != 0)
 			return -1;
@@ -1733,7 +1734,8 @@ dhcp_run(const struct options *options, int *pid_fd)
 
 	state->signal_fd = signal_fd();
 
-	if (state->options & DHCPCD_BACKGROUND)
+	if (state->options & DHCPCD_BACKGROUND &&
+	    !(state->options & DHCPCD_DAEMONISED))
 		if (daemonise(state, options) == -1)
 			goto eexit;