From 3b658a579fd2f7d1411a88cdf04fa0ea4d955685 Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Sat, 22 Jan 2005 04:26:48 +0000 Subject: [PATCH] 2005-01-21 Dan Williams * src/NetworkManager.c - Daemonize earlier so that glib doesn't get confused (?) git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@390 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 5 +++++ src/NetworkManager.c | 12 ++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 804679cc28..bb4c93dd40 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-01-21 Dan Williams + + * src/NetworkManager.c + - Daemonize earlier so that glib doesn't get confused (?) + 2005-01-21 Dan Williams * panel-applet/NMWirelessApplet.[ch] diff --git a/src/NetworkManager.c b/src/NetworkManager.c index 0c7dcf2ba2..417b2f88a9 100644 --- a/src/NetworkManager.c +++ b/src/NetworkManager.c @@ -694,6 +694,12 @@ int main( int argc, char *argv[] ) } } + if (become_daemon && daemon (0, 0) < 0) + { + syslog (LOG_ERR, "NetworkManager could not daemonize. errno = %d", errno); + exit (EXIT_FAILURE); + } + g_type_init (); if (!g_thread_supported ()) g_thread_init (NULL); @@ -762,12 +768,6 @@ int main( int argc, char *argv[] ) g_source_set_callback (link_source, nm_link_state_monitor, nm_data, NULL); link_source_id = g_source_attach (link_source, nm_data->main_context); - if (become_daemon && daemon (0, 0) < 0) - { - syslog (LOG_ERR, "NetworkManager could not daemonize. errno = %d", errno); - exit (EXIT_FAILURE); - } - if (!nm_named_manager_start (nm_data->named, &error)) { syslog (LOG_CRIT, "Couldn't initialize nameserver: %s", error->message);