hal/hald/linux block_class_device.c,1.35,1.36

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux
In directory pdx:/tmp/cvs-serv32516/hald/linux

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

	* hald/linux/block_class_device.c (block_class_pre_process): Disable
	media_check+automount and set block.no_partitions to TRUE for
	floppy drives - Now my LS120 drive in my Dell laptop works fine
	with HAL.



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- block_class_device.c	5 Jul 2004 18:54:58 -0000	1.35
+++ block_class_device.c	6 Jul 2004 16:35:56 -0000	1.36
@@ -1236,8 +1236,26 @@
 				has_removable_media = TRUE;
 			} else if (strcmp (media, "floppy") == 0) {
 				has_removable_media = TRUE;
+
+				/* No partitions */
+				hal_device_property_set_bool (
+					d, "block.no_partitions", TRUE);
+
+				/* I've got a LS120 that identifies as a
+				 * floppy; polling doesn't work so disable
+				 * media check and automount
+				 */
+				hal_device_property_set_bool (
+					d, "storage.media_check_enabled",
+					FALSE);
+				hal_device_property_set_bool (
+					d, "storage.automount_enabled",
+					FALSE);
+
 			} else if (strcmp (media, "tape") == 0) {
 				has_removable_media = TRUE;
+
+				/* TODO: Someone test with tape drives! */
 			}
 			
 		}