summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/nm-manager.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nm-manager.c b/src/nm-manager.c
index 5744a8cdc9..71b9d7074f 100644
--- a/src/nm-manager.c
+++ b/src/nm-manager.c
@@ -138,6 +138,7 @@ typedef struct {
guint timestamp_update_id;
gboolean startup;
+ gboolean devices_inited;
} NMManagerPrivate;
#define NM_MANAGER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NM_TYPE_MANAGER, NMManagerPrivate))
@@ -687,6 +688,9 @@ check_if_startup_complete (NMManager *self)
if (!priv->startup)
return;
+ if (!priv->devices_inited)
+ return;
+
if (!nm_settings_get_startup_complete (priv->settings)) {
nm_log_dbg (LOGD_CORE, "check_if_startup_complete returns FALSE because of NMSettings");
return;
@@ -4201,6 +4205,8 @@ nm_manager_start (NMManager *self, GError **error)
*/
system_create_virtual_devices (self);
+ priv->devices_inited = TRUE;
+
check_if_startup_complete (self);
return TRUE;