hal/hald/linux block_class_device.c,1.74,1.75

[David Zeuthen]

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

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

	* hald/linux/block_class_device.c (block_class_pre_process): Set
	has_removable_media for USB floppies in case the removable file in
	sysfs is gone



Index: block_class_device.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux/block_class_device.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- block_class_device.c	20 Sep 2004 09:00:14 -0000	1.74
+++ block_class_device.c	21 Sep 2004 06:39:00 -0000	1.75
@@ -1504,7 +1504,6 @@
 					"disk");
 				break;
 			case 1:	/* Tape */
-				has_removable_media = TRUE;
 				hal_device_property_set_string (
 					stordev,
 					"storage.drive_type", 
@@ -1555,6 +1554,7 @@
 			 * FALSE - for devices where this doesn't work,
 			 * we can override it with .fdi files
 			 */
+			has_removable_media = TRUE;
 		}
 
 	} else {
@@ -1576,9 +1576,7 @@
 			has_removable_media = TRUE;
 
 		sysfs_close_attribute (attr);
-	}
-
-
+	} 
 	
 	hal_device_property_set_bool (stordev, "storage.removable", has_removable_media);