hal: Branch 'master'

[Danny Kukawka]

 doc/spec/hal-spec-properties.xml |    6 ++++++
 hald/linux/blockdev.c            |    4 ++++
 2 files changed, 10 insertions(+)

New commits:
commit 79738e3dd75e37bdece662203b93af74ea555141
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Wed Oct 22 10:14:07 2008 +0200

    allow also PCI as possible storage.bus
    
    Allow also PCI as possible storage.bus, needed e.g. on older
    kernel versions to detect cciss storage devices.

diff --git a/doc/spec/hal-spec-properties.xml b/doc/spec/hal-spec-properties.xml
index 08098a1..ba25511 100644
--- a/doc/spec/hal-spec-properties.xml
+++ b/doc/spec/hal-spec-properties.xml
@@ -4345,6 +4345,12 @@ org.freedesktop.Hal.Device.Volume.method_signatures = {'ssas', 'as', 'as'}
             </row>
             <row>
               <entry></entry>
+              <entry>pci</entry>
+              <entry></entry>
+              <entry>PCI interface</entry>
+            </row>
+            <row>
+              <entry></entry>
               <entry></entry>
               <entry></entry>
               <entry></entry>
diff --git a/hald/linux/blockdev.c b/hald/linux/blockdev.c
index b970483..ab42341 100644
--- a/hald/linux/blockdev.c
+++ b/hald/linux/blockdev.c
@@ -1189,6 +1189,10 @@ hotplug_event_begin_add_blockdev (const gchar *sysfs_path, const gchar *device_f
 					physdev = d_it;
 					physdev_udi = udi_it;
 					hal_device_property_set_string (d, "storage.bus", "vio");
+				} else if (strcmp (bus, "pci") == 0) {
+					physdev = d_it;
+					physdev_udi = udi_it;
+					hal_device_property_set_string (d, "storage.bus", "pci");
 				}
 			}