diff --git a/src/core/main.c b/src/core/main.c index 911aeba9a3..7299a91cfd 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -298,12 +298,6 @@ main(int argc, char *argv[]) _nm_utils_is_manager_process = TRUE; - /* Known to cause a possible deadlock upon GDBus initialization: - * https://bugzilla.gnome.org/show_bug.cgi?id=674885 */ - g_type_ensure(G_TYPE_SOCKET); - g_type_ensure(G_TYPE_DBUS_CONNECTION); - g_type_ensure(NM_TYPE_DBUS_MANAGER); - /* we determine a first-start (contrary to a restart during the same boot) * based on the existence of NM_CONFIG_DEVICE_STATE_DIR directory. */ config_cli = nm_config_cmd_line_options_new( @@ -328,6 +322,12 @@ main(int argc, char *argv[]) exit(result); } + /* Known to cause a possible deadlock upon GDBus initialization: + * https://bugzilla.gnome.org/show_bug.cgi?id=674885 */ + g_type_ensure(G_TYPE_SOCKET); + g_type_ensure(G_TYPE_DBUS_CONNECTION); + g_type_ensure(NM_TYPE_DBUS_MANAGER); + nm_main_utils_ensure_not_running_pidfile(global_opt.pidfile); nm_main_utils_ensure_statedir();