fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-06 10:50:14 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

main: (order) log "is starting" message immediately after setting up logging

Browse source 
(cherry picked from commit f64c79afda)

Conflicts:
	src/main.c
This commit is contained in:
Thomas Haller 2015-03-13 23:29:46 +01:00
parent 22db307456
commit ba054666f0
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main.c
View file

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