Timeout should not automagically increase when using IPv4LL.

If we need extra we should handle that at handle_exit_timeout() and log.

diff --git a/dhcpcd.c b/dhcpcd.c
index 7d2d5b12386bf7e77ab759944d593567e4f83bd7..cff3fde466457a19a7d76e451dbe170673d64ee8 100644 (file)
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1766,10 +1766,7 @@ main(int argc, char **argv)
        {
                daemonise();
        } else if (options & DHCPCD_DAEMONISE && ifo->timeout > 0) {
-               oi = ifo->timeout;
-               if (ifo->options & DHCPCD_IPV4LL)
-                       oi += 10;
-               add_timeout_sec(oi, handle_exit_timeout, NULL);
+               add_timeout_sec(ifo->timeout, handle_exit_timeout, NULL);
        }
        free_options(ifo);