From: Roy Marples <roy@marples.name>
Date: Sat, 26 Jun 2010 09:17:54 +0000 (+0000)
Subject: Always daemonise on timeout if running in master mode.
X-Git-Tag: v5.2.6~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3ec600b3c6b7f811610c9204cf9cbfd73973cb9;p=thirdparty%2Fdhcpcd.git

Always daemonise on timeout if running in master mode.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index cb33929e..11db53af 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -198,8 +198,13 @@ handle_exit_timeout(_unused void *arg)
 	struct interface *ifp;
 
 	syslog(LOG_ERR, "timed out");
-	if (!(options & DHCPCD_TIMEOUT_IPV4LL))
-		exit(EXIT_FAILURE);
+	if (!(options & DHCPCD_TIMEOUT_IPV4LL)) {
+		if (options & DHCPCD_MASTER) {
+			daemonise();
+			return;
+		} else
+			exit(EXIT_FAILURE);
+	}
 	options &= ~DHCPCD_TIMEOUT_IPV4LL;
 	timeout = (PROBE_NUM * PROBE_MAX) + PROBE_WAIT + 1;
 	/* Add an extra second per interface */