hal/hald/linux block_class_device.c,1.68,1.69

[David Zeuthen]

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

Modified Files:
	block_class_device.c 
Log Message:
2004-09-12  David Zeuthen  <david at fubar.dk>

	* hald/linux/block_class_device.c (block_class_in_gdl): Force the
	initial poll if we support media_check_enabled; should fix some
	issues with the IBM USB Memory Stick that shockingly report
	/sys/block/<drive>/removable set to 0.



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- block_class_device.c	3 Sep 2004 17:47:08 -0000	1.68
+++ block_class_device.c	12 Sep 2004 21:26:10 -0000	1.69
@@ -1579,8 +1579,16 @@
 		    HalDevice *d,
 		    const char *udi)
 {
-	/* check for media on the device */
-	detect_media (d, FALSE);
+	dbus_bool_t force_initial_poll;
+
+	/* check for media on the device 
+	 *
+	 * Force the initial poll if we support media_check_enabled; should fix some issues with
+	 * the IBM USB Memory Stick that shockingly report /sys/block/<drive>/removable set to
+	 * 0.
+	 */
+	force_initial_poll = hal_device_property_get_bool (d, "storage.media_check_enabled");
+	detect_media (d, force_initial_poll);
 
 	/* Check the mtab to see if the device is mounted */
 	etc_mtab_process_all_block_devices (TRUE);