Delay IPv4LL by a potential DHCP delay as well.

diff --git a/dhcpcd.c b/dhcpcd.c
index 5a9d4305928716638bbc294459c20d403ded0e78..7e1844c5f034ef547c6c95e1620bcc7de412ef18 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -204,7 +204,7 @@ handle_exit_timeout(void *arg)
                return;
        }
        ctx->options &= ~DHCPCD_TIMEOUT_IPV4LL;
-       timeout = (PROBE_NUM * PROBE_MAX) + (PROBE_WAIT * 2);
+       timeout = (PROBE_NUM * PROBE_MAX) + (PROBE_WAIT * 2) + DHCP_MAX_DELAY;
        syslog(LOG_WARNING, "allowing %d seconds for IPv4LL timeout", timeout);
        eloop_timeout_add_sec(ctx->eloop, timeout, handle_exit_timeout, ctx);
 }