From 529092f035680584e38f4fcfa8473876e9b7f86c Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 14 Nov 2014 09:48:41 +0100 Subject: [PATCH] Revert "cli: Finish waiting for device activation when they disconnect" In case there's already a connection on the device, it traverses to DISCONNECTED. We shouldn't cease waiting then. This reverts commit 94a57d5e07b9e3d7f52b4ea3c8b86da9eed28baa. --- clients/cli/devices.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/clients/cli/devices.c b/clients/cli/devices.c index 52fc1c7cb6..3703743957 100644 --- a/clients/cli/devices.c +++ b/clients/cli/devices.c @@ -1366,8 +1366,7 @@ monitor_device_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data g_print (_("Connection with UUID '%s' created and activated on device '%s'\n"), nm_active_connection_get_uuid (active), nm_device_get_iface (device)); quit (); - } else if ( state <= NM_DEVICE_STATE_DISCONNECTED - || state >= NM_DEVICE_STATE_DEACTIVATING) { + } else if (state == NM_DEVICE_STATE_FAILED) { reason = nm_device_get_state_reason (device); g_string_printf (nmc->return_text, _("Error: Connection activation failed: (%d) %s."), reason, nmc_device_reason_to_string (reason));