hal/hald hald.c,1.12,1.13

[David Zeuthen]

Update of /cvs/hal/hal/hald
In directory gabe:/tmp/cvs-serv17391/hald

Modified Files:
	hald.c 
Log Message:
2004-08-23  David Zeuthen  <david at fubar.dk>

	* hald/hald.c (main): Move daemonazation back to beginning (fixes
	fdo bug #1165) for now



Index: hald.c
===================================================================
RCS file: /cvs/hal/hal/hald/hald.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- hald.c	22 Aug 2004 19:27:22 -0000	1.12
+++ hald.c	23 Aug 2004 17:19:01 -0000	1.13
@@ -246,6 +246,7 @@
 main (int argc, char *argv[])
 {
 	GMainLoop *loop;
+	guint sigterm_iochn_listener_source_id;
 
 	logger_init ();
 	if (getenv ("HALD_VERBOSE"))
@@ -311,43 +312,6 @@
 
 	HAL_DEBUG (("opt_become_daemon = %d", opt_become_daemon));
 
-	hald_read_conf_file ();
-
-	g_type_init ();
-
-	/* set up the dbus services */
-	if (!hald_dbus_init ())
-		return 1;
-
-	loop = g_main_loop_new (NULL, FALSE);
-
-	/* initialize persitent property store, read uuid from path */
-	if (hald_get_conf ()->persistent_device_list)
-		hal_pstore_init (PACKAGE_LOCALSTATEDIR "/lib/hal/uuid");
-
-	/* initialize operating system specific parts */
-	osspec_init ();
-
-	hald_is_initialising = TRUE;
-
-	/* detect devices */
-	osspec_probe ();
-
-	/* run the main loop and serve clients */
-	g_main_loop_run (loop);
-
-	return 0;
-}
-
-void 
-osspec_probe_done (void)
-{
-	guint sigterm_iochn_listener_source_id;
-
-	HAL_INFO (("Device probing completed"));
-
-	hald_is_initialising = FALSE;
-
 	if (opt_become_daemon) {
 		int child_pid;
 		int dev_null_fd;
@@ -412,6 +376,43 @@
 	
 	/* Finally, setup unix signal handler for TERM */
 	signal (SIGTERM, handle_sigterm);
+
+
+	hald_read_conf_file ();
+
+	g_type_init ();
+
+	/* set up the dbus services */
+	if (!hald_dbus_init ())
+		return 1;
+
+	loop = g_main_loop_new (NULL, FALSE);
+
+	/* initialize persitent property store, read uuid from path */
+	if (hald_get_conf ()->persistent_device_list)
+		hal_pstore_init (PACKAGE_LOCALSTATEDIR "/lib/hal/uuid");
+
+	/* initialize operating system specific parts */
+	osspec_init ();
+
+	hald_is_initialising = TRUE;
+
+	/* detect devices */
+	osspec_probe ();
+
+	/* run the main loop and serve clients */
+	g_main_loop_run (loop);
+
+	return 0;
+}
+
+void 
+osspec_probe_done (void)
+{
+
+	HAL_INFO (("Device probing completed"));
+
+	hald_is_initialising = FALSE;
 }