From b9f0451fa35393ceedf6d9d20b78c43578ebea5d Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Wed, 12 Jul 2017 17:57:30 +0200 Subject: New upstream version 1.8.2 --- src/nm-checkpoint.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/nm-checkpoint.c') diff --git a/src/nm-checkpoint.c b/src/nm-checkpoint.c index 3f2f0eaa..d59bc574 100644 --- a/src/nm-checkpoint.c +++ b/src/nm-checkpoint.c @@ -275,6 +275,17 @@ activate: _LOGD ("rollback: reactivating connection %s", nm_settings_connection_get_uuid (connection)); 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, connection, dev_checkpoint->applied_connection, -- cgit 1.3.0-6-gf8a5