hal/hald/linux2 blockdev.c,1.39,1.40

[David Zeuthen]

Update of /cvs/hal/hal/hald/linux2
In directory kemper:/tmp/cvs-serv30101/hald/linux2

Modified Files:
	blockdev.c 
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: blockdev.c
===================================================================
RCS file: /cvs/hal/hal/hald/linux2/blockdev.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- blockdev.c	10 Mar 2006 18:46:16 -0000	1.39
+++ blockdev.c	26 Mar 2006 20:46:54 -0000	1.40
@@ -768,6 +768,12 @@
 					physdev = d_it;
 					physdev_udi = udi_it;
 					hal_device_property_set_string (d, "storage.bus", "ide");
+					/* want to continue here, because it may be pcmcia */
+				} else if (strcmp (bus, "pcmcia") == 0) {
+					physdev = d_it;
+					physdev_udi = udi_it;
+					is_hotpluggable = TRUE;
+					hal_device_property_set_string (d, "storage.bus", "pcmcia");
 					break;
 				} else if (strcmp (bus, "mmc") == 0) {
 					physdev = d_it;