diff options
| author | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
|---|---|---|
| committer | Jeremy Bicha <jeremy.bicha@canonical.com> | 2023-02-14 10:06:06 -0500 |
| commit | b3c2e57e153446d32d16f2d99e6abbb50146dddb (patch) | |
| tree | e71a5353ff26c7e33cbe6e482874bedc1c3cc1cd /src/nm-online | |
| parent | 1d817ebf5302c204e3ce9d3512db13bf834fee33 (diff) | |
| parent | ed857ba34efc2ec899f2e3fbd8e35324561a55b2 (diff) | |
Merge tag 'debian/1.42.0-1' into ubuntu/master
network-manager Debian release 1.42.0-1
Diffstat (limited to 'src/nm-online')
| -rw-r--r-- | src/nm-online/nm-online.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nm-online/nm-online.c b/src/nm-online/nm-online.c index 0807270e..bba3cd5c 100644 --- a/src/nm-online/nm-online.c +++ b/src/nm-online/nm-online.c @@ -233,15 +233,15 @@ main(int argc, char *argv[]) GOptionContext *opt_ctx = NULL; gboolean success; GOptionEntry options[] = { - {"quiet", 'q', 0, G_OPTION_ARG_NONE, &data.quiet, N_("Don't print anything"), NULL}, - {"wait-for-startup", + {"quiet", 'q', 0, G_OPTION_ARG_NONE, &data.quiet, N_("Don't print anything"), NULL}, + {"wait-for-startup", 's', 0, G_OPTION_ARG_NONE, &data.wait_startup, N_("Wait for NetworkManager startup instead of a connection"), NULL}, - {"timeout", + {"timeout", 't', 0, G_OPTION_ARG_INT, @@ -249,14 +249,14 @@ main(int argc, char *argv[]) N_("Time to wait for a connection, in seconds (without the option, default value is 30). " "Maximum value is 2073600 seconds."), "<timeout>"}, - {"exit", + {"exit", 'x', 0, G_OPTION_ARG_NONE, &data.exit_no_nm, N_("Exit immediately if NetworkManager is not running or connecting"), NULL}, - {NULL}, + {NULL}, }; /* Set locale to be able to use environment variables */ |