diff options
| author | Jiří Klimeš <jklimes@redhat.com> | 2015-06-30 15:37:58 +0200 |
|---|---|---|
| committer | Jiří Klimeš <jklimes@redhat.com> | 2015-06-30 15:49:06 +0200 |
| commit | a396ad2ac12171cc6d2f332083c25059a5648cf6 (patch) | |
| tree | 3e658e7e3a5f49bf3038b19dda3c51f128ff8d79 | |
| parent | 67057079a433a60523d0937b075b4203b4730c63 (diff) | |
| download | NetworkManager-a396ad2ac12171cc6d2f332083c25059a5648cf6.tar.gz | |
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
| -rw-r--r-- | src/nm-manager.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 67a2c48420..d32ab2167f 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1616,10 +1616,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); |