diff options
| author | Dan Williams <dcbw@redhat.com> | 2014-12-05 14:30:36 -0600 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-12-16 21:55:13 +0100 |
| commit | 94091e31db803b4874b921db04f53c76bc75fb86 (patch) | |
| tree | a6711ca6ce8902afcd74659fc2ebbc9cb541fde8 | |
| parent | 8dd6a3b60075700ce2c0976670bd1d55fd5ae135 (diff) | |
| download | NetworkManager-94091e31db803b4874b921db04f53c76bc75fb86.tar.gz | |
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.
(cherry picked from commit 71027ce5f1cec2f3356deb1edaf9d0d346a9e067)
| -rw-r--r-- | src/nm-manager.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 06f24abdb8..bed07e4162 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); |