diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-06-23 12:44:31 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-06-23 12:44:49 +0200 |
| commit | 2e958bacebb11ec4769311125ab0e3a8042ea880 (patch) | |
| tree | ac04ecbc76d316e64ba088fd2dd7a191383362f2 | |
| parent | 33f954e251c4b6dae4000c2873347c1043f13f36 (diff) | |
| download | NetworkManager-2e958bacebb11ec4769311125ab0e3a8042ea880.tar.gz | |
nmcli: don't hang activation of masters that progress beyond ip-config
Some master connetions are able to progress beyond activating/ip-config -- the
slaves might have appeared during the activation, or the connection doesn't
need slaves to obtain the configuration (it could be method=manual or shared).
| -rw-r--r-- | clients/cli/connections.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/clients/cli/connections.c b/clients/cli/connections.c index 6fa2fe7371..b4388647fe 100644 --- a/clients/cli/connections.c +++ b/clients/cli/connections.c @@ -1855,7 +1855,7 @@ device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data) nm_object_get_path (NM_OBJECT (active))); quit (); } else if ( ac_state == NM_ACTIVE_CONNECTION_STATE_ACTIVATING - && state == NM_DEVICE_STATE_IP_CONFIG) { + && state >= NM_DEVICE_STATE_IP_CONFIG) { if (nmc->print_output == NMC_PRINT_PRETTY) nmc_terminal_erase_line (); g_print (_("Connection successfully activated (master waiting for slaves) (D-Bus active path: %s)\n"), |