diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2020-02-17 13:24:28 +0100 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2020-02-17 13:30:35 +0100 |
| commit | e127a82370e417bff2706bbdc7a4d6f177c1459b (patch) | |
| tree | 793afde55cadb4e5109e878d62c913a22623a46e /src/nm-manager.c | |
| parent | b2d3ba33a7a91f37b1aa53b70e338271da496a4a (diff) | |
| download | NetworkManager-e127a82370e417bff2706bbdc7a4d6f177c1459b.tar.gz | |
Revert "manager: drop devices_inited field in NManagerPrivate for devices_inited_id"
After this change the startup-complete event is reached too early,
even before priv->devices_inited_id is initialized.
This reverts commit d50856b5c66e6d7a8ab1af7826297787e72e06e7.
Diffstat (limited to 'src/nm-manager.c')
| -rw-r--r-- | src/nm-manager.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c index f28c3d05cf..c610a67638 100644 --- a/src/nm-manager.c +++ b/src/nm-manager.c @@ -195,6 +195,7 @@ typedef struct { NMConnectivityState connectivity_state; bool startup:1; + bool devices_inited:1; bool sleeping:1; bool net_enabled:1; @@ -1540,7 +1541,7 @@ check_if_startup_complete (NMManager *self) if (!priv->startup) return; - if (priv->devices_inited_id) + if (!priv->devices_inited) return; reason = nm_settings_get_startup_complete_blocked_reason (priv->settings); @@ -6619,6 +6620,7 @@ devices_inited_cb (gpointer user_data) NMManagerPrivate *priv = NM_MANAGER_GET_PRIVATE (self); priv->devices_inited_id = 0; + priv->devices_inited = TRUE; check_if_startup_complete (self); return G_SOURCE_REMOVE; } @@ -6688,8 +6690,8 @@ nm_manager_start (NMManager *self, GError **error) for (i = 0; connections[i]; i++) connection_changed (self, connections[i]); - if (!priv->devices_inited_id) - priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL); + nm_clear_g_source (&priv->devices_inited_id); + priv->devices_inited_id = g_idle_add_full (G_PRIORITY_LOW + 10, devices_inited_cb, self, NULL); return TRUE; } |