From 35059ed48e79e06a5f940230dbace1947db8cc34 Mon Sep 17 00:00:00 2001 From: Beniamino Galvani Date: Fri, 11 Mar 2016 09:37:18 +0100 Subject: [PATCH] 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. --- src/devices/nm-device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index ff4f43d34e..619eda9bba 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -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; } /**