diff options
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/main.c b/src/main.c index 067a0cee3c..8bfc05c681 100644 --- a/src/main.c +++ b/src/main.c @@ -366,16 +366,6 @@ main (int argc, char *argv[]) } } - /* Parse the state file */ - if (!parse_state_file (global_opt.state_file, &net_enabled, &wifi_enabled, &wwan_enabled, &wimax_enabled, &error)) { - fprintf (stderr, _("State file %s parsing failed: (%d) %s\n"), - global_opt.state_file, - error ? error->code : -1, - (error && error->message) ? error->message : _("unknown")); - /* Not a hard failure */ - } - g_clear_error (&error); - if (global_opt.become_daemon && !global_opt.debug) { if (daemon (0, 0) < 0) { int saved_errno; @@ -394,6 +384,16 @@ main (int argc, char *argv[]) nm_logging_syslog_openlog (global_opt.debug); + /* 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", + global_opt.state_file, + error ? error->code : -1, + (error && error->message) ? error->message : _("unknown")); + /* Not a hard failure */ + } + g_clear_error (&error); + dbus_threads_init_default (); /* Ensure that non-exported properties don't leak out, and that the |