diff options
| author | Francesco Giudici <fgiudici@redhat.com> | 2017-05-05 23:45:36 +0200 |
|---|---|---|
| committer | Francesco Giudici <fgiudici@redhat.com> | 2017-05-09 10:45:39 +0200 |
| commit | b6b7d909f7023ef1830fe5a072b64e109397f609 (patch) | |
| tree | 35fa2c1af04411212b78199472a11f9c37b6bf73 | |
| parent | ddfeed4530bb0ade4249025930da4f0456026d9f (diff) | |
| download | NetworkManager-b6b7d909f7023ef1830fe5a072b64e109397f609.tar.gz | |
manager: avoid generating in memory connections during startup for managed devices
Commit #acf1067a allowed to assume connections on already managed
devices. Anyway, in complex scenario with layered connections, during
the startup of NetworkManager, this could interfere with the connection
assumption based on saved state.
So, avoid to re-assume connections on already managed devices during
startup.
Fixes: acf1067a455b02b60985e209df568d3fcc3fac9e
| -rw-r--r-- | src/nm-manager.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index d646e23ff7..a74021951a 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1853,6 +1853,7 @@ recheck_assume_connection (NMManager *self, gboolean generated = FALSE; NMDeviceState state; NMDeviceSysIfaceState if_state; + NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); g_return_val_if_fail (NM_IS_MANAGER (self), FALSE); g_return_val_if_fail (NM_IS_DEVICE (device), FALSE); @@ -1868,7 +1869,7 @@ recheck_assume_connection (NMManager *self, return FALSE; if_state = nm_device_sys_iface_state_get (device); - if (if_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED) + if (!priv->startup && (if_state == NM_DEVICE_SYS_IFACE_STATE_MANAGED)) nm_assert (!guess_assume && (assume_connection_uuid == NULL)); else if (if_state != NM_DEVICE_SYS_IFACE_STATE_EXTERNAL) return FALSE; |