diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-03-31 23:43:48 +0200 |
|---|---|---|
| committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-04-01 20:37:50 +0200 |
| commit | 2f9859baa8fd9ce36b66d8b36d6dbf9383114368 (patch) | |
| tree | c42d71e50d009544c9c624992c4016df3f7392e4 /src/network/wait-online/wait-online.c | |
| parent | Merge pull request #12147 from yuwata/network-gre-key-12144 (diff) | |
| download | systemd-2f9859baa8fd9ce36b66d8b36d6dbf9383114368.tar.xz systemd-2f9859baa8fd9ce36b66d8b36d6dbf9383114368.zip | |
wait-online: add --any option
When this option is specified, wait-online exits with success even
when several interfaces are in configuring state.
Closes #9714.
Diffstat (limited to '')
| -rw-r--r-- | src/network/wait-online/wait-online.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c index fd7a48d81d..4ce2ac31b2 100644 --- a/src/network/wait-online/wait-online.c +++ b/src/network/wait-online/wait-online.c @@ -19,6 +19,7 @@ static usec_t arg_timeout = 120 * USEC_PER_SEC; static Hashmap *arg_interfaces = NULL; static char **arg_ignore = NULL; static LinkOperationalState arg_required_operstate = _LINK_OPERSTATE_INVALID; +static bool arg_any = false; STATIC_DESTRUCTOR_REGISTER(arg_interfaces, hashmap_free_free_keyp); STATIC_DESTRUCTOR_REGISTER(arg_ignore, strv_freep); @@ -41,6 +42,7 @@ static int help(void) { " --ignore=INTERFACE Don't take these interfaces into account\n" " -o --operational-state=OPERSTATE\n" " Required operational state\n" + " --any Wait until at least one of the interfaces is online\n" " --timeout=SECS Maximum time to wait for network connectivity\n" "\nSee the %s for details.\n" , program_invocation_short_name @@ -101,6 +103,7 @@ static int parse_argv(int argc, char *argv[]) { enum { ARG_VERSION = 0x100, ARG_IGNORE, + ARG_ANY, ARG_TIMEOUT, }; @@ -111,6 +114,7 @@ static int parse_argv(int argc, char *argv[]) { { "interface", required_argument, NULL, 'i' }, { "ignore", required_argument, NULL, ARG_IGNORE }, { "operational-state", required_argument, NULL, 'o' }, + { "any", no_argument, NULL, ARG_ANY }, { "timeout", required_argument, NULL, ARG_TIMEOUT }, {} }; @@ -158,6 +162,10 @@ static int parse_argv(int argc, char *argv[]) { arg_required_operstate = s; break; } + case ARG_ANY: + arg_any = true; + break; + case ARG_TIMEOUT: r = parse_sec(optarg, &arg_timeout); if (r < 0) @@ -192,11 +200,11 @@ static int run(int argc, char *argv[]) { assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0); - r = manager_new(&m, arg_interfaces, arg_ignore, arg_required_operstate, arg_timeout); + r = manager_new(&m, arg_interfaces, arg_ignore, arg_required_operstate, arg_any, arg_timeout); if (r < 0) return log_error_errno(r, "Could not create manager: %m"); - if (manager_all_configured(m)) + if (manager_configured(m)) goto success; notify_message = notify_start("READY=1\n" |