Always respect the timeout.

diff --git a/dhcpcd.c b/dhcpcd.c
index 007c71ce972cfc5aaec62568a224f6a308ba732b..16903ed6a19b3ec481a8dd011a2159e9a03bd376 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1883,10 +1883,7 @@ main(int argc, char **argv)
                {
                        syslog(LOG_WARNING, "no interfaces have a carrier");
                        daemonise();
-               } else if (ifo->timeout > 0 &&
-                          (options & DHCPCD_DAEMONISE ||
-                           options & DHCPCD_TEST))
-               {
+               } else if (ifo->timeout > 0) {
                        if (options & DHCPCD_IPV4LL)
                                options |= DHCPCD_TIMEOUT_IPV4LL;
                        add_timeout_sec(ifo->timeout, handle_exit_timeout,