fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-07 07:18:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: quit if manager startup completed before starting the mainloop

Browse source
This commit is contained in:
Dan Williams 2015-03-11 08:23:23 -05:00
parent cb17be1e12
commit a5891299b9
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main.c
View file

@ -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);