From ba054666f04dc44cc607c9a4e82b1cac34388610 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Fri, 13 Mar 2015 23:29:46 +0100
Subject: [PATCH] main: (order) log "is starting" message immediately after
 setting up logging

(cherry picked from commit f64c79afda1006bbe6f569883b37721c3d0f14d5)

Conflicts:
	src/main.c
---
 src/main.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/main.c b/src/main.c
index 0d0d3361d4..fb0cc06259 100644
--- a/src/main.c
+++ b/src/main.c
@@ -240,7 +240,7 @@ int
 main (int argc, char *argv[])
 {
 	gboolean wifi_enabled = TRUE, net_enabled = TRUE, wwan_enabled = TRUE, wimax_enabled = TRUE;
-	gboolean success;
+	gboolean success = FALSE;
 	NMManager *manager = NULL;
 	gs_unref_object NMVpnManager *vpn_manager = NULL;
 	gs_unref_object NMDnsManager *dns_mgr = NULL;
@@ -377,6 +377,8 @@ main (int argc, char *argv[])
 
 	nm_logging_syslog_openlog (global_opt.debug);
 
+	nm_log_info (LOGD_CORE, "NetworkManager (version " NM_DIST_VERSION ") is starting...");
+
 	/* Parse the state file */
 	if (!parse_state_file (global_opt.state_file, &net_enabled, &wifi_enabled, &wwan_enabled, &wimax_enabled, &error)) {
 		nm_log_err (LOGD_CORE, "State file %s parsing failed: (%d) %s",
@@ -394,9 +396,6 @@ main (int argc, char *argv[])
 	 */
 	dbus_glib_global_set_disable_legacy_property_access ();
 
-	nm_log_info (LOGD_CORE, "NetworkManager (version " NM_DIST_VERSION ") is starting...");
-	success = FALSE;
-
 	nm_log_info (LOGD_CORE, "Read config: %s", nm_config_get_description (config));
 	nm_log_info (LOGD_CORE, "WEXT support is %s",
 #if HAVE_WEXT