fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-03 21:00:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

device: fix delay startup complete for unrealized devices

Browse source 
Since commit 6845b9b80a ("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: 6845b9b80a
(cherry picked from commit 9ad8010fe0)
This commit is contained in:
Thomas Haller 2017-09-29 17:08:55 +02:00
parent b18ff17d3d
commit 0ba498b17d
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/devices/nm-device.c
View file

@ -12030,7 +12030,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;