hal/hald/linux2 coldplug.c,1.2,1.3 osspec.c,1.1,1.2

[David Zeuthen]

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

Modified Files:
	coldplug.c osspec.c 
Log Message:
2005-01-25  David Zeuthen  <davidz at redhat.com>

	* hald/linux2/osspec.c (osspec_probe): Add HAL_INFO's around
	coldplug event synthesization so we can see how long it takes.

	* hald/linux2/coldplug.c: Undefine HAL_COLDPLUG_VERBOSE by default
	to reduce log spamming.

2005-01-25  David Zeuthen  <davidz at redhat.com>

	Merge the changes applied to the hal-0_4-stable-branch yesterday

	2005-01-24  David Zeuthen  <davidz at redhat.com>

	* libhal-storage/libhal-storage.c (mopts_collect): Remove debugging
	fprintf's

	2005-01-24  David Zeuthen  <davidz at redhat.com>

	* libhal-storage/libhal-storage.c (mopts_collect): Also remove
	mount options if something is set to FALSE (based on patch from
	Sebastian Dransfeld <sebastid at stud.ntnu.no>; also fix a pretty bad
	bug where the computation of is_imply_opt were totally wrong.
	(hal_volume_policy_get_mount_options),
	(hal_drive_policy_get_mount_options): Collect imply options in the
	correct order now that mopts_collect is fixed : -do-



Index: coldplug.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/coldplug.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- coldplug.c	23 Jan 2005 23:11:59 -0000	1.2
+++ coldplug.c	25 Jan 2005 16:55:09 -0000	1.3
@@ -56,7 +56,8 @@
 			       GHashTable *sysfs_to_bus_map, 
 			       GHashTable *sysfs_to_class_in_devices_map);
 
-#define HAL_COLDPLUG_VERBOSE
+/* For debugging */
+/*#define HAL_COLDPLUG_VERBOSE*/
 
 /** This function serves one major purpose : build an ordered list of
  *  pairs (sysfs path, subsystem) to process when starting up:

Index: osspec.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/osspec.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- osspec.c	18 Jan 2005 19:48:13 -0000	1.1
+++ osspec.c	25 Jan 2005 16:55:09 -0000	1.2
@@ -230,7 +230,9 @@
 	hal_device_store_add (hald_get_gdl (), root);
 
 	/* will enqueue hotplug events for entire system */
+	HAL_INFO (("Synthesizing events..."));
 	coldplug_synthesize_events ();
+	HAL_INFO (("Done synthesizing events"));
 
 	/* start processing events */
 	hotplug_event_process_queue ();