hal/fdi/90defaultpolicy storage-policy.fdi,1.6,1.7

[David Zeuthen]

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

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

	* fdi/90defaultpolicy/storage-policy.fdi: Allow fstype 'auto' for 
	optical drives instead of 'iso9660,udf'

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

	* hald/linux/volume_id/volume_id.c (volume_id_probe): Move probe_ntfs
	to the bottom as some ext3 partition was wrongly identified as a NTFS
	partition



Index: storage-policy.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/90defaultpolicy/storage-policy.fdi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- storage-policy.fdi	18 Oct 2004 23:54:11 -0000	1.6
+++ storage-policy.fdi	25 Oct 2004 16:32:10 -0000	1.7
@@ -39,7 +39,7 @@
     <match key="storage.no_partitions_hint" bool="true">
       <!-- optical drives -->
       <match key="storage.drive_type" string="cdrom">
-	<merge key="storage.policy.mount_filesystem" type="string">iso9660,udf</merge>
+	<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">