diff options
| -rw-r--r-- | src/core/devices/nm-device.c | 2 | ||||
| -rw-r--r-- | src/core/nm-manager.c | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c index cc18777a00..86e9c038cb 100644 --- a/src/core/devices/nm-device.c +++ b/src/core/devices/nm-device.c @@ -2650,7 +2650,7 @@ _assume_state_set(NMDevice * self, && nm_streq0(priv->assume_state_connection_uuid, assume_state_connection_uuid)) return; - _LOGD(LOGD_DEVICE, + _LOGE(LOGD_DEVICE, "assume-state: set guess-assume=%c, connection=%s%s%s", assume_state_guess_assume ? '1' : '0', NM_PRINT_FMT_QUOTE_STRING(assume_state_connection_uuid)); diff --git a/src/core/nm-manager.c b/src/core/nm-manager.c index d859c1eaae..6b3bbd7b78 100644 --- a/src/core/nm-manager.c +++ b/src/core/nm-manager.c @@ -2853,10 +2853,14 @@ recheck_assume_connection(NMManager *self, NMDevice *device) g_return_val_if_fail(NM_IS_MANAGER(self), FALSE); g_return_val_if_fail(NM_IS_DEVICE(device), FALSE); + _LOG2W(LOGD_DEVICE, device, " ---- recheck_assume_connection()"); + if (!nm_device_get_managed(device, FALSE)) { /* If the device is only unmanaged by NM_UNMANAGED_PLATFORM_INIT, * don't reset the state now but wait until it becomes managed. */ - if (nm_device_get_unmanaged_flags(device, NM_UNMANAGED_ALL) != NM_UNMANAGED_PLATFORM_INIT) + if (nm_device_get_unmanaged_flags( + device, + NM_UNMANAGED_ALL & ~(NM_UNMANAGED_PLATFORM_INIT | NM_UNMANAGED_PARENT))) nm_device_assume_state_reset(device); _LOG2D(LOGD_DEVICE, device, "assume: don't assume because %s", "not managed"); return FALSE; @@ -3178,10 +3182,14 @@ _device_realize_finish(NMManager *self, NMDevice *device, const NMPlatformLink * nm_device_realize_finish(device, plink); + _LOG2W(LOGD_DEVICE, device, " ---- _device_realize_finish()"); + if (!nm_device_get_managed(device, FALSE)) { /* If the device is only unmanaged by NM_UNMANAGED_PLATFORM_INIT, * don't reset the state now but wait until it becomes managed. */ - if (nm_device_get_unmanaged_flags(device, NM_UNMANAGED_ALL) != NM_UNMANAGED_PLATFORM_INIT) + if (nm_device_get_unmanaged_flags( + device, + NM_UNMANAGED_ALL & ~(NM_UNMANAGED_PLATFORM_INIT | NM_UNMANAGED_PARENT))) nm_device_assume_state_reset(device); return; } |