From a4a92299fb3b5990edc2a4fc29460c837d650688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= Date: Tue, 30 Jun 2015 15:37:58 +0200 Subject: [PATCH] core: do not manage devices that are not initialized by platform Commit 388b7830f322b60960884328ff51f7b4df0ef3d3 added NM_UNMANAGED_PLATFORM_INIT. Fixes: 388b7830f322b60960884328ff51f7b4df0ef3d3 Fixes:Beaker: NetworkManager_Test35_veth_goes_to_unmanaged_state (cherry picked from commit a396ad2ac12171cc6d2f332083c25059a5648cf6) --- src/nm-manager.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/nm-manager.c b/src/nm-manager.c index eb4713c6cb..e6640ab3c9 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1634,10 +1634,7 @@ recheck_assume_connection (NMDevice *device, gpointer user_data) if (manager_sleeping (self)) return FALSE; - 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_EXTERNAL_DOWN) || - nm_device_get_unmanaged_flag (device, NM_UNMANAGED_PARENT)) + if (nm_device_get_unmanaged_flag (device, NM_UNMANAGED_ALL & ~NM_UNMANAGED_DEFAULT)) return FALSE; state = nm_device_get_state (device);