colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

checkpoint: disconnect device before reactivation during rollback

Browse Source 
Since commit 0922a17738 ("manager: avoid that auto-activations
preempt user activations") the manager doesn't allow a internal
activation to disconnect the same connection already active on the
device.  Thus, during a rollback we must ensure that the device is
deactivated before.

Fixes: 0922a17738
This commit is contained in:
Beniamino Galvani
2017-07-05 11:01:56 +02:00
parent e1fd127511
commit 348959cfa2
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/nm-checkpoint.c
View File

@@ -275,6 +275,17 @@ activate:
_LOGD ("rollback: reactivating connection %s", _LOGD ("rollback: reactivating connection %s",
nm_settings_connection_get_uuid (connection)); nm_settings_connection_get_uuid (connection));
subject = nm_auth_subject_new_internal (); subject = nm_auth_subject_new_internal ();
/* Disconnect the device if needed. This necessary because now
* the manager prevents the reactivation of the same connection by
* an internal subject. */
if ( nm_device_get_state (device) > NM_DEVICE_STATE_DISCONNECTED
&& nm_device_get_state (device) < NM_DEVICE_STATE_DEACTIVATING) {
nm_device_state_changed (device,
NM_DEVICE_STATE_DEACTIVATING,
NM_DEVICE_STATE_REASON_NEW_ACTIVATION);
}
if (!nm_manager_activate_connection (priv->manager, if (!nm_manager_activate_connection (priv->manager,
connection, connection,
dev_checkpoint->applied_connection, dev_checkpoint->applied_connection,