From ad7ea00c81b01c548b76cd12ca3e14ddefb13152 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Wed, 11 Mar 2015 08:23:23 -0500 Subject: [PATCH] core: quit if manager startup completed before starting the mainloop (cherry picked from commit a5891299b91a3887afd8f9605b0b7c97ee48e107) --- src/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main.c b/src/main.c index b3206fb44e..98fd399e5b 100644 --- a/src/main.c +++ b/src/main.c @@ -69,6 +69,7 @@ #define NM_DEFAULT_SYSTEM_STATE_FILE NMSTATEDIR "/NetworkManager.state" static GMainLoop *main_loop = NULL; +static gboolean quit_early = FALSE; static gboolean parse_state_file (const char *filename, @@ -184,6 +185,7 @@ manager_configure_quit (NMManager *manager, gpointer user_data) { nm_log_info (LOGD_CORE, "quitting now that startup is complete"); g_main_loop_quit (main_loop); + quit_early = TRUE; } /* @@ -215,7 +217,6 @@ main (int argc, char *argv[]) GError *error = NULL; gboolean wrote_pidfile = FALSE; char *bad_domains = NULL; - gboolean quit_early = FALSE; GOptionEntry options[] = { { "version", 'V', 0, G_OPTION_ARG_NONE, &show_version, N_("Print NetworkManager version and exit"), NULL },