From: Roy Marples <roy@marples.name>
Date: Mon, 24 Nov 2014 11:03:28 +0000 (+0000)
Subject: When not daemonising, don't exit on timeout.
X-Git-Tag: v6.6.3~9
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=465083d9e04480ec22928e35a1c6ee3493c663ad;p=thirdparty%2Fdhcpcd.git

When not daemonising, don't exit on timeout.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 42a5e49a..5293f971 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1722,7 +1722,7 @@ main(int argc, char **argv)
 			syslog(LOG_WARNING, "no interfaces have a carrier");
 			if (dhcpcd_daemonise(&ctx))
 				goto exit_success;
-		} else if (t > 0) {
+		} else if (t > 0 && ctx.options & DHCPCD_DAEMONISE) {
 			eloop_timeout_add_sec(ctx.eloop, t,
 			    handle_exit_timeout, &ctx);
 		}