From 5f04324f8bef43ebe831a6fa20ea8577dcad0ac5 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 5 Dec 2014 14:30:36 -0600 Subject: [PATCH] core: don't assume connections for INTERNAL or PARENT unmanaged devices INTERNAL is actually a nop right now because the only thing that sets it is suspend/resume, which is covered by the preceding manager_sleeping() call. But we may use this more in the future, so add it while we're here. Devices that are unmanaged because their parent is unmanaged probably shouldn't assume connections either, per 4e105c50. --- src/nm-manager.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index 06f24abdb..bed07e416 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1653,7 +1653,9 @@ recheck_assume_connection (NMDevice *device, gpointer user_data) if (manager_sleeping (self)) return FALSE; - if (nm_device_get_unmanaged_flag (device, NM_UNMANAGED_USER)) + if (nm_device_get_unmanaged_flag (device, NM_UNMANAGED_USER) || + nm_device_get_unmanaged_flag (device, NM_UNMANAGED_INTERNAL) || + nm_device_get_unmanaged_flag (device, NM_UNMANAGED_PARENT)) return FALSE; state = nm_device_get_state (device);