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

[David Zeuthen]

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

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

	* tools/device-manager/hal-device-manager.in: New file; append
	path to where we install so we don't need a symlink to /usr/share.
	Fixes issue with SELinux strict policy (RH Bug #134845)

	* tools/device-manager/hal-device-manager: Delete this one as it is
	now generated by configure

2004-10-29  David Zeuthen  <davidz at redhat.com>

	* fdi/90defaultpolicy/storage-policy.fdi: Allow SCSI optical drives
	and correct typo in 'sync' (was 'async').
	
2004-10-29  David Zeuthen  <davidz at redhat.com>

	* hald/linux/pcmcia_utils.c (pcmcia_socket_open): Refine socket
	location order to work better with SELinux. From Dan Walsh
	<dwalsh at redhat.com>



Index: storage-policy.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- storage-policy.fdi	26 Oct 2004 19:44:53 -0000	1.8
+++ storage-policy.fdi	1 Nov 2004 22:57:21 -0000	1.9
@@ -34,6 +34,12 @@
 	<merge key="storage.policy.should_mount" type="bool">true</merge>
       </match>
     </match>
+    <!-- Also add SCSI optical drives -->
+    <match key="storage.bus" string="scsi">
+      <match key="storage.drive_type" string="cdrom">
+        <merge key="storage.policy.should_mount" type="bool">true</merge>
+      </match>
+    </match>
 
     <!-- Handle drives with non-partitioned media  -->
     <match key="storage.no_partitions_hint" bool="true">
@@ -126,11 +132,11 @@
 	       volumes smaller than 2GB -->
 	  <match key="volume.size" compare_lt="2147483648">
 	    <match key="@block.storage_device:storage.hotpluggable" bool="true">
-	      <merge key="volume.policy.mount_option.async" type="bool">true</merge>
+	      <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
 	      <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
 	    </match>
 	    <match key="@block.storage_device:storage.removable" bool="true">
-	      <merge key="volume.policy.mount_option.async" type="bool">true</merge>
+	      <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
 	      <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
 	    </match>
 	  </match>