From 2e958bacebb11ec4769311125ab0e3a8042ea880 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 23 Jun 2015 12:44:31 +0200 Subject: [PATCH] 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). --- clients/cli/connections.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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"),