hal/hald/linux block_class_device.c,1.65,1.66

[David Zeuthen]

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

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

	* hald/linux/block_class_device.c (detect_media): Set volume.fsusage
	to empty string by default
	(block_class_pre_process): Also set volume.fsusage to empty string by
	default. Set storage.drive_type to disk by default (should now work
	the the ub kernel driver instead of usb-storage)

	* hald/hald.c (main): Print out version

	* tools/linux/hal_dev.c (main): Put in option for more debug



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- block_class_device.c	28 Aug 2004 13:35:47 -0000	1.65
+++ block_class_device.c	29 Aug 2004 15:57:41 -0000	1.66
@@ -931,6 +931,7 @@
 
 		/* set defaults */
 		hal_device_property_set_string (child, "volume.fstype", "");
+		hal_device_property_set_string (child, "volume.fsusage", "");
 		hal_device_property_set_string (child, "volume.fsversion", "");
 		hal_device_property_set_string (child, "volume.uuid", "");
 		hal_device_property_set_string (child, "volume.label", "");
@@ -1186,6 +1187,7 @@
 		hal_device_property_set_string (d, "info.category", "volume");
 		hal_device_property_set_string (d, "info.product", "Volume");
 		hal_device_property_set_string (d, "volume.fstype", "");
+		hal_device_property_set_string (d, "volume.fsusage", "");
 		hal_device_property_set_string (d, "volume.fsversion", "");
 		hal_device_property_set_string (d, "volume.label", "");
 		hal_device_property_set_string (d, "volume.uuid", "");
@@ -1237,6 +1239,9 @@
 	 ************************************************************/
 
 
+	/* defaults */
+	hal_device_property_set_string (stordev, "storage.drive_type", "disk");
+
 	/* We are a disk or cdrom drive; maybe we even offer 
 	 * removable media 
 	 */