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

[David Zeuthen]

Update of /cvs/hal/hal/fdi/information/10freedesktop
In directory kemper:/tmp/cvs-serv30101/fdi/information/10freedesktop

Modified Files:
	10-usb-card-readers.fdi 
Log Message:
2006-03-26  David Zeuthen  <davidz at redhat.com>

        Fix for RH bug #185557

        * hald/linux2/blockdev.c (hotplug_event_begin_add_blockdev): Introduce
        "pcmcia" as a value storage.bus and mark devices of this bus as being
        hotpluggable

        * fdi/information/10freedesktop/10-usb-card-readers.fdi: When
        storage.bus="pcmcia" mark all drives with "FLASH" in the model
        string as having drive_type="compact_flash"



Index: 10-usb-card-readers.fdi
===================================================================
RCS file: /cvs/hal/hal/fdi/information/10freedesktop/10-usb-card-readers.fdi,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- 10-usb-card-readers.fdi	15 Jan 2006 16:54:05 -0000	1.6
+++ 10-usb-card-readers.fdi	26 Mar 2006 20:46:54 -0000	1.7
@@ -3,6 +3,13 @@
 <deviceinfo version="0.2">
   <device>
 
+    <!-- Should probably move to separate file for pcmcia devices -->
+    <match key="storage.bus" string="pcmcia">
+      <match key="storage.model" contains="FLASH">
+        <merge key="storage.drive_type" type="string">compact_flash</merge>
+      </match>
+    </match>
+
     <!-- Should probably move to separate file for firewire devices -->
     <match key="storage.bus" string="ieee1394">
       <match key="storage.model" string="FWIRE CF READER">