device: allow NM-owned device to be assumed

Software devices created by NM should be kept up when quitting so that
they can be assumed upon restart. But now we consider devices created
by NM (those with the @is_nm_owned flag) not capable of assuming
connections and therefore we tear them down and deconfigure when
quitting.

Change this and ignore @is_nm_owned when deciding if a device can be
re-assumed.
This commit is contained in:
Beniamino Galvani 2016-03-11 09:37:18 +01:00 committed by Thomas Haller
parent e1edcda317
commit 35059ed48e

View file

@ -3066,8 +3066,7 @@ nm_device_check_slave_connection_compatible (NMDevice *self, NMConnection *slave
static gboolean
nm_device_can_assume_connections (NMDevice *self)
{
return !!NM_DEVICE_GET_CLASS (self)->update_connection
&& !NM_DEVICE_GET_PRIVATE (self)->is_nm_owned;
return !!NM_DEVICE_GET_CLASS (self)->update_connection;
}
/**