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

core: quit if manager startup completed before starting the mainloop

Browse source 
(cherry picked from commit a5891299b9)
This commit is contained in:
Dan Williams 2015-03-11 08:23:23 -05:00
parent 9eba2b0e7d
commit ad7ea00c81
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main.c
View file

@ -69,6 +69,7 @@
#define NM_DEFAULT_SYSTEM_STATE_FILE NMSTATEDIR "/NetworkManager.state" #define NM_DEFAULT_SYSTEM_STATE_FILE NMSTATEDIR "/NetworkManager.state"
static GMainLoop *main_loop = NULL; static GMainLoop *main_loop = NULL;
static gboolean quit_early = FALSE;
static gboolean static gboolean
parse_state_file (const char *filename, 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"); nm_log_info (LOGD_CORE, "quitting now that startup is complete");
g_main_loop_quit (main_loop); g_main_loop_quit (main_loop);
quit_early = TRUE;
} }
/* /*
@ -215,7 +217,6 @@ main (int argc, char *argv[])
GError *error = NULL; GError *error = NULL;
gboolean wrote_pidfile = FALSE; gboolean wrote_pidfile = FALSE;
char *bad_domains = NULL; char *bad_domains = NULL;
gboolean quit_early = FALSE;
GOptionEntry options[] = { GOptionEntry options[] = {
{ "version", 'V', 0, G_OPTION_ARG_NONE, &show_version, N_("Print NetworkManager version and exit"), NULL }, { "version", 'V', 0, G_OPTION_ARG_NONE, &show_version, N_("Print NetworkManager version and exit"), NULL },