diff options
| author | Thomas Haller <thaller@redhat.com> | 2017-09-29 17:08:55 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2017-09-29 17:36:05 +0200 |
| commit | 9ad8010fe0c42291580e4a801ed85947ae660d38 (patch) | |
| tree | b3395f72bd31961ecfc7887359d2045d2b516cf6 | |
| parent | ba8f81581e00f8809212c6be1243bd83ed907f3b (diff) | |
| download | NetworkManager-9ad8010fe0c42291580e4a801ed85947ae660d38.tar.gz | |
device: fix delay startup complete for unrealized devices
Since commit 6845b9b80a9fcec9d2c9e7b56a37329f38089f2e ("device: delay
startup complete until device is initialized in platform", we also wait
for devices that are still initializing platform/UDEV.
Obviously, that only applies to realized devices.
Otherwise, an unrealized device is going to block startup complete.
Fixes: 6845b9b80a9fcec9d2c9e7b56a37329f38089f2e
| -rw-r--r-- | src/devices/nm-device.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c index e05d9649d3..0ecd8a2b61 100644 --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c @@ -12213,7 +12213,8 @@ nm_device_has_pending_action (NMDevice *self) if (priv->pending_actions) return TRUE; - if (nm_device_get_unmanaged_flags (self, NM_UNMANAGED_PLATFORM_INIT)) { + if ( nm_device_is_real (self) + && nm_device_get_unmanaged_flags (self, NM_UNMANAGED_PLATFORM_INIT)) { /* as long as the platform link is not yet initialized, we have a pending * action. */ return TRUE; |