hal/fdi/90defaultpolicy storage-policy.fdi,1.9,1.10

[David Zeuthen]

Update of /cvs/hal/hal/fdi/90defaultpolicy
In directory gabe:/tmp/cvs-serv31002/fdi/90defaultpolicy

Modified Files:
	storage-policy.fdi 
Log Message:
2004-12-13  David Zeuthen  <davidz at redhat.com>

	Merged all changes from the stable branch so HEAD is on par.



Index: storage-policy.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- storage-policy.fdi	1 Nov 2004 22:57:21 -0000	1.9
+++ storage-policy.fdi	14 Dec 2004 02:57:48 -0000	1.10
@@ -47,7 +47,6 @@
       <match key="storage.drive_type" string="cdrom">
 	<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
 	<merge key="storage.policy.desired_mount_point" type="string">cdrom</merge>
-	<merge key="storage.policy.mount_option.ro" type="bool">true</merge>
 	<match key="storage.cdrom.cdr" bool="true">
 	  <merge key="storage.policy.desired_mount_point" type="string">cdrecorder</merge>
 	</match>
@@ -73,6 +72,7 @@
 	  <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>
@@ -81,6 +81,24 @@
 	  <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>
 
     <!-- Normal volumes; use volume label, uuid or drive_type -->
@@ -96,6 +114,11 @@
 	       idedisk, scsidisk etc. -->
 	  <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.bus</merge>
 	  <append key="volume.policy.desired_mount_point" type="string">disk</append>
+
+         <!-- zip drives -->
+         <match key="storage.drive_type" string="zip">
+ 	   <merge key="storage.policy.desired_mount_point" type="string">zip</merge>
+         </match>
 	  
           <!-- Best: If available use filesystem label -->
           <match key="volume.label" empty="false">