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.
This commit is contained in:
Dan Williams 2014-12-05 14:30:36 -06:00
parent 8dd6a3b600
commit dc4d39a2d4

View file

@ -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);