diff options
author | Beniamino Galvani <bgalvani@redhat.com> | 2018-03-19 14:15:56 +0100 |
---|---|---|
committer | Beniamino Galvani <bgalvani@redhat.com> | 2018-03-22 10:15:27 +0100 |
commit | 6493bd443f6c1d089919f0bb63c735bc2a76fc75 (patch) | |
tree | 47b31602b3077d8bd91c514dddabe6fa2bf357df | |
parent | 217a7ad55ad4d09f2c195930ba548d46d660ed24 (diff) | |
download | NetworkManager-6493bd443f6c1d089919f0bb63c735bc2a76fc75.tar.gz |
manager: retry activating devices when the parent becomes managed
Since commit ed640f857a1a ("manager: ignore unmanaged devices when
looking for parent by UUID"), unmanaged devices are ignored when
looking for potential parent connection matches. Therefore, a software
device can fail autoactivation because the parent is not managed yet
and NM never tries to reactivate it. Ensure that we retry other
devices when a parent device becomes managed.
Fixes: ed640f857a1a1eae45d92cce35ea8dcfd8aba08d
https://bugzilla.redhat.com/show_bug.cgi?id=1553595
-rw-r--r-- | src/nm-manager.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index 7764dbbee3..1b18f44942 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -1193,6 +1193,10 @@ manager_device_state_changed (NMDevice *device, NMManager *self = NM_MANAGER (user_data); NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); + if ( old_state == NM_DEVICE_STATE_UNMANAGED + && new_state > NM_DEVICE_STATE_UNMANAGED) + retry_connections_for_parent_device (self, device); + switch (new_state) { case NM_DEVICE_STATE_UNMANAGED: case NM_DEVICE_STATE_UNAVAILABLE: |