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

[David Zeuthen]

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

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

	* fdi/policy/10osvendor/10-storage-policy.fdi: Use mount point
	'ipod' for iPod's (works better with gtkpod :-). Apply patch from
	Daniel Serpell <daniel.serpell at aplik.cl> that I got via Sjoerd
	Simons <sjoerd at luon.net> : The FDI rule that detects USB ZIP drive
	and names the mountpoint is incorrectly write, so partitioned
	ZIP's are named generically. The attached patch fixes the
	test (lookup in the parent of the partition).

	* fdi/information/10freedesktop/10-usb-music-players.fdi: Rename
	portable_audio_player.database_type to p_a_p.type



Index: 10-storage-policy.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/10-storage-policy.fdi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- 10-storage-policy.fdi	25 Feb 2005 21:39:43 -0000	1.2
+++ 10-storage-policy.fdi	27 Feb 2005 00:27:16 -0000	1.3
@@ -102,11 +102,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>
+	  
+          <!-- zip drives -->
+          <match key="@block.storage_device:storage.drive_type" string="zip">
+ 	    <merge key="volume.policy.desired_mount_point" type="string">zip</merge>
+          </match>
 	  
           <!-- Best: If available use filesystem label -->
           <match key="volume.label" empty="false">
@@ -141,6 +141,14 @@
 	    </match>
 	  </match>
 	  
+	  <!-- Attempt mount point 'ipod' for iPod's -->
+	  <match key="@block.storage_device:portable_audio_player.type" string="ipod">
+	    <merge key="volume.policy.desired_mount_point" type="string">ipod</merge>
+	  </match>
+	  
+	</match>
+	
+	  
 	  <!-- whitelist of partition table id's, if from a msdos partition table -->
 	  <match key="volume.partition.msdos_part_table_type" exists="true">
 	    <!-- Default to no mount and punch holes -->