fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-04-17 19:40:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cli: stop waiting for deactivation if device reaches unmanaged state

Browse source 
default-unmanaged devices enter unmanaged state right after they're
disconnected.

(cherry picked from commit 29fe1abf0d)
This commit is contained in:
Lubomir Rintel 2015-04-23 10:00:47 -04:00
parent 1fff1a3d36
commit b05c9d67e7
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
clients/cli/devices.c
View file

@ -1645,7 +1645,7 @@ disconnect_state_cb (NMDevice *device, GParamSpec *pspec, gpointer user_data)
state = nm_device_get_state (device);
if (state == NM_DEVICE_STATE_DISCONNECTED) {
if (state <= NM_DEVICE_STATE_DISCONNECTED) {
g_signal_handlers_disconnect_by_data (device, user_data);
g_print (_("Device '%s' successfully disconnected.\n"),
nm_device_get_iface (device));
@ -1682,9 +1682,9 @@ disconnect_device_cb (GObject *object, GAsyncResult *result, gpointer user_data)
} else {
state = nm_device_get_state (device);
if (nmc->nowait_flag || state == NM_DEVICE_STATE_DISCONNECTED) {
if (nmc->nowait_flag || state <= NM_DEVICE_STATE_DISCONNECTED) {
/* Don't want to wait or device already disconnected */
if (state == NM_DEVICE_STATE_DISCONNECTED) {
if (state <= NM_DEVICE_STATE_DISCONNECTED) {
if (nmc->print_output == NMC_PRINT_PRETTY)
nmc_terminal_erase_line ();
g_print (_("Device '%s' has been disconnected.\n"), nm_device_get_iface (device));