summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2015-03-13 23:29:46 +0100
committerThomas Haller <thaller@redhat.com>2015-03-20 11:43:30 +0100
commitf64c79afda1006bbe6f569883b37721c3d0f14d5 (patch)
tree02b1959d2a92f0254e2ed224803a3c9016f60ca5
parent7be9024c826f524a1383bb6fd1264a1f9247b1d1 (diff)
downloadNetworkManager-f64c79afda1006bbe6f569883b37721c3d0f14d5.tar.gz
main: (order) log "is starting" message immediately after setting up logging
-rw-r--r--src/main.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main.c b/src/main.c
index 8bfc05c681..35c7b4e3b0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -250,7 +250,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 NMSettings *settings = NULL;
NMConfig *config;
@@ -384,6 +384,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",
@@ -401,9 +403,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_data_get_config_description (nm_config_get_data (config)));
nm_log_info (LOGD_CORE, "WEXT support is %s",
#if HAVE_WEXT