mirrors/dhcpcd
0
0
Fork 0
mirror of https://github.com/rsmarples/dhcpcd.git synced 2024-11-24 10:35:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

When operating on one interface only, respect the configured timeout.

Browse Source
This commit is contained in:
Roy Marples 2011-03-29 10:36:17 +00:00
parent ba2c29b403
commit 8d796699f0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dhcpcd.c
View File

@ -2025,17 +2025,20 @@ main(int argc, char **argv)
}
}
}
if (options & DHCPCD_MASTER)
i = if_options->timeout;
else
i = ifaces->state->options->timeout;
if (opt == 0 &&
options & DHCPCD_LINK &&
!(options & DHCPCD_WAITIP))
{
syslog(LOG_WARNING, "no interfaces have a carrier");
daemonise();
} else if (if_options->timeout > 0) {
} else if (i > 0) {
if (options & DHCPCD_IPV4LL)
options |= DHCPCD_TIMEOUT_IPV4LL;
add_timeout_sec(if_options->timeout,
handle_exit_timeout, NULL);
add_timeout_sec(i, handle_exit_timeout, NULL);
}
}
free_options(if_options);