hal/fdi/policy/10osvendor 10-storage-policy.fdi,1.1,1.2

[David Zeuthen]

Update of /cvs/hal/hal/fdi/policy/10osvendor
In directory gabe:/tmp/cvs-serv9612/fdi/policy/10osvendor

Modified Files:
	10-storage-policy.fdi 
Log Message:
2005-02-25  David Zeuthen  <davidz at redhat.com>

	Get IDE Zip drives and PC Style floppy drives to work.

	* hald/linux2/blockdev.c (add_blockdev_probing_helper_done): Add a
	note that helper_data may be NULL
	(blockdev_callouts_preprobing_storage_done): Don't probe non-
	partitioned media where we cannot check for media 
	(hotplug_event_begin_add_blockdev): Fix up for PC floppy drives. Fix
	stoopid bug where == 0 was missing for strcmp (media, "floppy). Doh

	* fdi/policy/10osvendor/10-storage-policy.fdi: Remove selinux
	mount options here because it is handled elsewhere now



Index: 10-storage-policy.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/10-storage-policy.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- 10-storage-policy.fdi	24 Feb 2005 16:50:34 -0000	1.1
+++ 10-storage-policy.fdi	25 Feb 2005 21:39:43 -0000	1.2
@@ -68,36 +68,24 @@
 	<match key="storage.cdrom.dvdrw" bool="true">
 	  <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
 	</match>
-	<match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
-	  <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
-	</match>
       </match>
 
       <!-- floppy drives -->
       <match key="storage.drive_type" string="floppy">
 	<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
 	<merge key="storage.policy.desired_mount_point" type="string">floppy</merge>
-	<match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
-	  <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
-	</match>
       </match>
 
       <!-- zip drives -->
       <match key="storage.drive_type" string="zip">
 	<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
 	<merge key="storage.policy.desired_mount_point" type="string">zip</merge>
-	<match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
-	  <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
-	</match>
       </match>
 
       <!-- jaz drives -->
       <match key="storage.drive_type" string="jaz">
 	<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
 	<merge key="storage.policy.desired_mount_point" type="string">jaz</merge>
-	<match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
-	  <merge key="storage.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
-	</match>
       </match>
     </match>
 
@@ -140,17 +128,6 @@
 	    </match>
 	  </match>
 	  
-	  <!-- Use selinux mount options for hotpluggable and removable
-	       volumes -->
-	  <match key="/org/freedesktop/Hal/devices/computer:linux.is_selinux_enabled" bool="true">
-	    <match key="@block.storage_device:storage.hotpluggable" bool="true">
-	      <merge key="volume.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
-	    </match>
-	    <match key="@block.storage_device:storage.removable" bool="true">
-	      <merge key="volume.policy.mount_option.fscontext=system_u:object_r:removable_t" type="bool">true</merge>
-	    </match>
-	  </match>
-
 	  <!-- Use noatime and sync options for all hotpluggable or removable
 	       volumes smaller than 2GB -->
 	  <match key="volume.size" compare_lt="2147483648">