diff options
| author | Dan Williams <dcbw@redhat.com> | 2015-03-11 08:23:23 -0500 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2015-03-11 09:17:01 -0500 |
| commit | a5891299b91a3887afd8f9605b0b7c97ee48e107 (patch) | |
| tree | 1754a3014627588726a2a5c6b2ac9a3919cd5243 | |
| parent | cb17be1e12fe55038185ccaa053a2fa799e4259c (diff) | |
| download | NetworkManager-a5891299b91a3887afd8f9605b0b7c97ee48e107.tar.gz | |
core: quit if manager startup completed before starting the mainloop
| -rw-r--r-- | src/main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c index 11ecffca98..3df3e11eb4 100644 --- a/src/main.c +++ b/src/main.c @@ -65,6 +65,7 @@ #define NM_DEFAULT_SYSTEM_STATE_FILE NMSTATEDIR "/NetworkManager.state" static GMainLoop *main_loop = NULL; +static gboolean configure_and_quit = FALSE; static gboolean parse_state_file (const char *filename, @@ -193,6 +194,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); + configure_and_quit = TRUE; } /* @@ -457,7 +459,8 @@ main (int argc, char *argv[]) success = TRUE; - g_main_loop_run (main_loop); + if (configure_and_quit == FALSE) + g_main_loop_run (main_loop); nm_manager_stop (manager); |