networkd-wait-online: add timeout
Default to timing out after 120 seconds without a network connection. Setting a timeout of 0 disables the timeout.
This commit is contained in:
parent
c4f1aff230
commit
e56cdb7ae2
4
TODO
4
TODO
|
@ -34,8 +34,6 @@ External:
|
|||
|
||||
Features:
|
||||
|
||||
* network-wait-online should have a configurable timeout, maybe as --timeout-usec=
|
||||
|
||||
* The udev blkid built-in should expose a property that reflects
|
||||
whether media was sensed in USB CF/SD card readers. This should then
|
||||
be used to control SYSTEMD_READY=1/0 so that USB card readers aren't
|
||||
|
@ -156,8 +154,6 @@ Features:
|
|||
|
||||
* timesyncd + resolved: add ugly bus calls to set NTP and DNS servers per-interface, for usage by NM
|
||||
|
||||
* networkd-wait-online really should have a timeout by default
|
||||
|
||||
* add infrastructure to allocate dynamic/transient users and UID ranges, for use in user-namespaced containers, per-seat gdm login screens and gdm guest sessions
|
||||
|
||||
* machined: add an API so that libvirt-lxc can inform us about network interfaces being removed or added to an existing machine
|
||||
|
|
|
@ -90,6 +90,13 @@
|
|||
more than once to ignore multiple network interfaces.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term><option>--timeout=</option></term>
|
||||
<listitem><para>Fail the service if the network is not
|
||||
online by the time the timeout elapses. A timeout of 0
|
||||
disables the timeout. Defaults to 120 seconds.
|
||||
</para></listitem>
|
||||
</varlistentry>
|
||||
</variablelist>
|
||||
</refsect1>
|
||||
|
||||
|
|
|
@ -31,6 +31,7 @@
|
|||
#include "networkd-wait-online.h"
|
||||
|
||||
#include "util.h"
|
||||
#include "time-util.h"
|
||||
|
||||
bool manager_ignore_link(Manager *m, Link *link) {
|
||||
char **ignore;
|
||||
|
@ -262,7 +263,7 @@ static int manager_network_monitor_listen(Manager *m) {
|
|||
return 0;
|
||||
}
|
||||
|
||||
int manager_new(Manager **ret, char **interfaces, char **ignore) {
|
||||
int manager_new(Manager **ret, char **interfaces, char **ignore, usec_t timeout) {
|
||||
_cleanup_(manager_freep) Manager *m = NULL;
|
||||
int r;
|
||||
|
||||
|
@ -282,6 +283,16 @@ int manager_new(Manager **ret, char **interfaces, char **ignore) {
|
|||
sd_event_add_signal(m->event, NULL, SIGTERM, NULL, NULL);
|
||||
sd_event_add_signal(m->event, NULL, SIGINT, NULL, NULL);
|
||||
|
||||
if (timeout > 0) {
|
||||
usec_t usec;
|
||||
|
||||
usec = now(clock_boottime_or_monotonic()) + timeout;
|
||||
|
||||
r = sd_event_add_time(m->event, NULL, clock_boottime_or_monotonic(), usec, 0, NULL, INT_TO_PTR(-ETIMEDOUT));
|
||||
if (r < 0)
|
||||
return r;
|
||||
}
|
||||
|
||||
sd_event_set_watchdog(m->event, true);
|
||||
|
||||
r = manager_network_monitor_listen(m);
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "build.h"
|
||||
|
||||
static bool arg_quiet = false;
|
||||
static usec_t arg_timeout = 120 * USEC_PER_SEC;
|
||||
static char **arg_interfaces = NULL;
|
||||
static char **arg_ignore = NULL;
|
||||
|
||||
|
@ -39,6 +40,7 @@ static void help(void) {
|
|||
" -q --quiet Do not show status information\n"
|
||||
" -i --interface=INTERFACE Block until at least these interfaces have appeared\n"
|
||||
" --ignore=INTERFACE Don't take these interfaces into account\n"
|
||||
" --timeout=SECS Maximum time to wait for network connectivity\n"
|
||||
, program_invocation_short_name);
|
||||
}
|
||||
|
||||
|
@ -47,6 +49,7 @@ static int parse_argv(int argc, char *argv[]) {
|
|||
enum {
|
||||
ARG_VERSION = 0x100,
|
||||
ARG_IGNORE,
|
||||
ARG_TIMEOUT,
|
||||
};
|
||||
|
||||
static const struct option options[] = {
|
||||
|
@ -55,10 +58,11 @@ static int parse_argv(int argc, char *argv[]) {
|
|||
{ "quiet", no_argument, NULL, 'q' },
|
||||
{ "interface", required_argument, NULL, 'i' },
|
||||
{ "ignore", required_argument, NULL, ARG_IGNORE },
|
||||
{ "timeout", required_argument, NULL, ARG_TIMEOUT },
|
||||
{}
|
||||
};
|
||||
|
||||
int c;
|
||||
int c, r;
|
||||
|
||||
assert(argc >= 0);
|
||||
assert(argv);
|
||||
|
@ -92,6 +96,13 @@ static int parse_argv(int argc, char *argv[]) {
|
|||
|
||||
break;
|
||||
|
||||
case ARG_TIMEOUT:
|
||||
r = parse_sec(optarg, &arg_timeout);
|
||||
if (r < 0)
|
||||
return r;
|
||||
|
||||
break;
|
||||
|
||||
case '?':
|
||||
return -EINVAL;
|
||||
|
||||
|
@ -121,7 +132,7 @@ int main(int argc, char *argv[]) {
|
|||
|
||||
assert_se(sigprocmask_many(SIG_BLOCK, SIGTERM, SIGINT, -1) == 0);
|
||||
|
||||
r = manager_new(&m, arg_interfaces, arg_ignore);
|
||||
r = manager_new(&m, arg_interfaces, arg_ignore, arg_timeout);
|
||||
if (r < 0) {
|
||||
log_error_errno(r, "Could not create manager: %m");
|
||||
goto finish;
|
||||
|
@ -143,10 +154,16 @@ int main(int argc, char *argv[]) {
|
|||
}
|
||||
|
||||
finish:
|
||||
sd_notify(false, "STATUS=All interfaces configured...");
|
||||
|
||||
strv_free(arg_interfaces);
|
||||
strv_free(arg_ignore);
|
||||
|
||||
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
|
||||
if (r >= 0) {
|
||||
sd_notify(false, "STATUS=All interfaces configured...");
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
} else {
|
||||
sd_notify(false, "STATUS=Failed waiting for network connectivity...");
|
||||
|
||||
return EXIT_FAILURE;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ struct Manager {
|
|||
};
|
||||
|
||||
void manager_free(Manager *m);
|
||||
int manager_new(Manager **ret, char **interfaces, char **ignore);
|
||||
int manager_new(Manager **ret, char **interfaces, char **ignore, usec_t timeout);
|
||||
|
||||
DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);
|
||||
|
||||
|
|
Loading…
Reference in a new issue