hal/fdi/information/10freedesktop 10-usb-card-readers.fdi,1.5,1.6

[David Zeuthen]

Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory gabe:/tmp/cvs-serv31515/fdi/information/10freedesktop

Modified Files:
	10-usb-card-readers.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: 10-usb-card-readers.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- 10-usb-card-readers.fdi	21 Nov 2005 19:50:26 -0000	1.5
+++ 10-usb-card-readers.fdi	15 Jan 2006 16:54:05 -0000	1.6
@@ -3,6 +3,13 @@
 <deviceinfo version="0.2">
   <device>
 
+    <!-- Should probably move to separate file for firewire devices -->
+    <match key="storage.bus" string="ieee1394">
+      <match key="storage.model" string="FWIRE CF READER">
+        <merge key="storage.drive_type" type="string">compact_flash</merge>
+      </match>
+    </match>
+
     <!-- Generic catch all -->
     <match key="storage.bus" string="usb">
       <match key="storage.model" contains="HS-CF">