hal/fdi/policy/10osvendor 20-storage-methods.fdi,1.6,1.7

[David Zeuthen]

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

Modified Files:
	20-storage-methods.fdi 
Log Message:
2006-01-15  David Zeuthen  <davidz at redhat.com>

        * tools/hal-system-storage-mount: Respect volume.ignore and refuse to
        mount if set to TRUE

        * libhal-storage/libhal-storage.h: Export libhal_volume_should_ignore
        as a public method (API addition, no breakage)

        * libhal-storage/libhal-storage.c (libhal_volume_should_ignore): New
        function.
        (libhal_volume_from_udi): Set vol->ignore_volume from property

        * fdi/policy/10osvendor/20-storage-methods.fdi: Introduce volume.ignore
        as a way for vendors and admins to signify a volume should be ignored.

        * fdi/information/10freedesktop/10-usb-card-readers.fdi: Add an entry
        for my Firewire card reader (yes, it works perfectly on my PB 12" G4
        running Fedora Rawhide - it's fast too.. vroom vroom).



Index: 20-storage-methods.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/policy/10osvendor/20-storage-methods.fdi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 20-storage-methods.fdi	11 Jan 2006 17:00:21 -0000	1.6
+++ 20-storage-methods.fdi	15 Jan 2006 16:54:05 -0000	1.7
@@ -6,6 +6,22 @@
       <append key="info.callouts.add" type="strlist">hal-system-storage-cleanup-mountpoints</append>
     </match>
     <match key="volume.fsusage" string="filesystem">
+
+      <!-- Here follow volumes we specifically want to ignore - it is the
+	   responsibility of software higher in the stack (e.g. gnome-vfs) and
+	   mount programs (e.g. Mount() on HAL) to respect volume.ignore -->
+
+      <!-- Should always ignore Apple Bootstrap partitions (it would be
+	   a security hole to mount it) - TODO: should use the bootable
+	   flag from the Mac partition table instead -->
+      <merge key="volume.ignore" type="bool">false</merge>
+      <match key="volume.fstype" string="hfs">
+	<match key="volume.label" string="bootstrap">
+	  <merge key="volume.ignore" type="bool">true</merge>
+	</match>
+      </match>
+
+
       <append key="info.interfaces" type="strlist">org.freedesktop.Hal.Device.Volume</append>
 
       <append key="org.freedesktop.Hal.Device.Volume.method_names" type="strlist">Mount</append>