diff options
author | Jiří Klimeš <jklimes@redhat.com> | 2014-03-31 08:44:20 +0200 |
---|---|---|
committer | Jiří Klimeš <jklimes@redhat.com> | 2014-03-31 08:44:20 +0200 |
commit | 0d1bdffe91e7693a6eec5be97fbef6c9e287bf05 (patch) | |
tree | 25d31f76410339d9acb33bbbbf218a36ce8fd89c | |
parent | 254d9a4850fa8b592122c4353d1948315c95c113 (diff) | |
parent | 0a85bff70a65d5a205b56bc9f74fc2b0237ad05a (diff) | |
download | NetworkManager-0d1bdffe91e7693a6eec5be97fbef6c9e287bf05.tar.gz |
Merge fixes for nm-online (rh #rh1054364)
https://bugzilla.redhat.com/show_bug.cgi?id=1054364
-rw-r--r-- | data/NetworkManager-wait-online-systemd-pre200.service.in | 2 | ||||
-rw-r--r-- | data/NetworkManager-wait-online.service.in | 2 | ||||
-rw-r--r-- | man/nm-online.1.in | 7 | ||||
-rw-r--r-- | test/nm-online.c | 57 |
4 files changed, 55 insertions, 13 deletions
diff --git a/data/NetworkManager-wait-online-systemd-pre200.service.in b/data/NetworkManager-wait-online-systemd-pre200.service.in index fd9be418ea..d145a79ff7 100644 --- a/data/NetworkManager-wait-online-systemd-pre200.service.in +++ b/data/NetworkManager-wait-online-systemd-pre200.service.in @@ -7,7 +7,7 @@ Before=network.target [Service] Type=oneshot -ExecStart=@bindir@/nm-online -q --timeout=30 +ExecStart=@bindir@/nm-online -s -q --timeout=30 [Install] WantedBy=network.target diff --git a/data/NetworkManager-wait-online.service.in b/data/NetworkManager-wait-online.service.in index b81c5b023c..6ad6942cc1 100644 --- a/data/NetworkManager-wait-online.service.in +++ b/data/NetworkManager-wait-online.service.in @@ -7,7 +7,7 @@ Before=network.target network-online.target [Service] Type=oneshot -ExecStart=@bindir@/nm-online -q --timeout=30 +ExecStart=@bindir@/nm-online -s -q --timeout=30 [Install] WantedBy=multi-user.target diff --git a/man/nm-online.1.in b/man/nm-online.1.in index 941f006b86..ddb2b17f79 100644 --- a/man/nm-online.1.in +++ b/man/nm-online.1.in @@ -19,9 +19,9 @@ .\" with this manual; if not, write to the Free Software Foundation, Inc., .\" 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. .\" -.\" Copyright (C) 2010 Red Hat, Inc. +.\" Copyright (C) 2010 - 2014 Red Hat, Inc. .\" -.TH NM-ONLINE "1" "11 July 2013" +.TH NM-ONLINE "1" "25 March 2014" .SH NAME nm-online \- ask NetworkManager whether the network is connected @@ -47,6 +47,9 @@ Exit immediately if NetworkManager is not running or connecting. .TP .B \-q, \-\-quiet Don't print anything. +.TP +.B \-s, \-\-wait-for-startup +Wait for NetworkManager finishing its startup instead of establishing a connection. .SH EXIT STATUS diff --git a/test/nm-online.c b/test/nm-online.c index c4dd258a15..581a99e3d2 100644 --- a/test/nm-online.c +++ b/test/nm-online.c @@ -15,6 +15,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * * Copyright (C) 2006 - 2008 Novell, Inc. + * Copyright (C) 2008 - 2014 Red Hat, Inc. * */ @@ -42,6 +43,7 @@ #include "nm-client.h" #define PROGRESS_STEPS 15 +#define WAIT_STARTUP_TAG "wait-startup" typedef struct { @@ -56,11 +58,22 @@ client_properties_changed (GObject *object, gpointer loop) { NMClient *client = NM_CLIENT (object); + NMState state; + gboolean wait_startup = GPOINTER_TO_UINT (g_object_get_data (object, WAIT_STARTUP_TAG)); if (!nm_client_get_manager_running (client)) return; - if (!nm_client_get_startup (client)) - g_main_loop_quit (loop); + + if (wait_startup) { + if (!nm_client_get_startup (client)) + g_main_loop_quit (loop); + } else { + state = nm_client_get_state (client); + if ( state == NM_STATE_CONNECTED_LOCAL + || state == NM_STATE_CONNECTED_SITE + || state == NM_STATE_CONNECTED_GLOBAL) + g_main_loop_quit (loop); + } } static gboolean @@ -93,20 +106,24 @@ main (int argc, char *argv[]) { gint t_secs = -1; gboolean exit_no_nm = FALSE; - gboolean quiet = FALSE; + gboolean wait_startup = FALSE; Timeout timeout; GOptionContext *opt_ctx = NULL; gboolean success; NMClient *client; + NMState state = NM_STATE_UNKNOWN; GMainLoop *loop; GOptionEntry options[] = { {"timeout", 't', 0, G_OPTION_ARG_INT, &t_secs, N_("Time to wait for a connection, in seconds (without the option, default value is 30)"), "<timeout>"}, - {"exit", 'x', 0, G_OPTION_ARG_NONE, &exit_no_nm, N_("Exit immediately if NetworkManager is not running"), NULL}, - {"quiet", 'q', 0, G_OPTION_ARG_NONE, &quiet, N_("Don't print anything"), NULL}, + {"exit", 'x', 0, G_OPTION_ARG_NONE, &exit_no_nm, N_("Exit immediately if NetworkManager is not running or connecting"), NULL}, + {"quiet", 'q', 0, G_OPTION_ARG_NONE, &timeout.quiet, N_("Don't print anything"), NULL}, + {"wait-for-startup", 's', 0, G_OPTION_ARG_NONE, &wait_startup, N_("Wait for NetworkManager startup instead of a connection"), NULL}, {NULL} }; + timeout.quiet = FALSE; + /* Set locale to be able to use environment variables */ setlocale (LC_ALL, ""); @@ -152,13 +169,35 @@ main (int argc, char *argv[]) loop = g_main_loop_new (NULL, FALSE); + g_object_set_data (G_OBJECT (client), WAIT_STARTUP_TAG, GUINT_TO_POINTER (wait_startup)); + state = nm_client_get_state (client); if (!nm_client_get_manager_running (client)) { - if (exit_no_nm) + if (exit_no_nm) { + g_object_unref (client); return 1; - } else if (!nm_client_get_startup (client)) - return 0; - if (!timeout.value) + } + } else if (wait_startup) { + if (!nm_client_get_startup (client)) { + g_object_unref (client); + return 0; + } + } else { + if ( state == NM_STATE_CONNECTED_LOCAL + || state == NM_STATE_CONNECTED_SITE + || state == NM_STATE_CONNECTED_GLOBAL) { + g_object_unref (client); + return 0; + } + } + if (exit_no_nm && (state != NM_STATE_CONNECTING)) { + g_object_unref (client); return 1; + } + + if (!timeout.value) { + g_object_unref (client); + return 1; + } timeout.norm = (double) timeout.value / (double) PROGRESS_STEPS; g_timeout_add_seconds (1, handle_timeout, &timeout); |