From: Roy Marples <roy@marples.name>
Date: Sat, 5 Oct 2013 16:28:33 +0000 (+0000)
Subject: If we timeout, remove any waitip config so that we daemonise
X-Git-Tag: v6.2.0~67
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f796465a67dfe374d25ee04949cc8e103c3db28e;p=thirdparty%2Fdhcpcd.git

If we timeout, remove any waitip config so that we daemonise
correctly.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index cd1ed640..36d73824 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -188,6 +188,11 @@ handle_exit_timeout(__unused void *arg)
 	syslog(LOG_ERR, "timed out");
 	if (!(options & DHCPCD_IPV4) || !(options & DHCPCD_TIMEOUT_IPV4LL)) {
 		if (options & DHCPCD_MASTER) {
+			/* We've timed out, so remove the waitip requirements.
+			 * If the user doesn't like this they can always set
+			 * an infinite timeout. */
+			options &=
+			    ~(DHCPCD_WAITIP | DHCPCD_WAITIP4 | DHCPCD_WAITIP6);
 			daemonise();
 			return;
 		} else