core: unschedule deletion of software device when starting an activation request

This fixes queued activation request to be aborted because the software
device gets removed before the device reaches the PREPARED state.
This happens, because when the previous connection disconnects, the
device will schedule its removal.

https://bugzilla.redhat.com/show_bug.cgi?id=1073015

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Dan Williams 2014-03-05 22:07:19 +01:00 committed by Thomas Haller
parent f56c82d861
commit 5ed2a9430a

View file

@ -4779,6 +4779,8 @@ _device_activate (NMDevice *self, NMActRequest *req)
nm_device_get_iface (self),
nm_connection_get_id (connection));
delete_on_deactivate_unschedule (priv);
/* Move default unmanaged devices to DISCONNECTED state here */
if (priv->default_unmanaged && priv->state == NM_DEVICE_STATE_UNMANAGED) {
nm_device_state_changed (self,