hal/fdi/90defaultpolicy storage-policy.fdi,1.4,1.5

[David Zeuthen]

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

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

	* fdi/90defaultpolicy/storage-policy.fdi: Never use filesystem UUDI
	for mount points in the default policy (/me badly flamed) - change
	fallback to <bustype>disk.



Index: storage-policy.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- storage-policy.fdi	14 Oct 2004 21:58:55 -0000	1.4
+++ storage-policy.fdi	15 Oct 2004 20:46:08 -0000	1.5
@@ -83,13 +83,10 @@
 	  <merge key="volume.policy.should_mount" type="bool">true</merge>
 	  <merge key="volume.policy.mount_filesystem" type="copy_property">volume.fstype</merge>
 	  
-	  <!-- Fallback is '<storage.drive_type>', e.g. disk, compact_flash etc. -->
-	  <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.drive_type</merge>
-	  
-	  <!-- Better: if available use UUID -->
-          <match key="volume.uuid" empty="false">
-            <merge key="volume.policy.desired_mount_point" type="copy_property">volume.uuid</merge>
-          </match>
+	  <!-- Fallback is '<storage.bus>', appended with 'disk', e.g. usbdisk,
+	       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>
 	  
           <!-- Best: If available use filesystem label -->
           <match key="volume.label" empty="false">