Fix subsystem lookup for older HAL releases

diff --git a/ChangeLog b/ChangeLog
index 551dabb3cb7878a595332cfa62920a787d1317b2..e056fe7209d67a1f255dee7447ce950aef84c31a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar 16 10:55:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
+
+       Fix subsystem lookup for older HAL releases
+       * src/node_device_hal.c: Check for linux.subsystem property
+
 Mon Mar 16 10:45:00 GMT 2009 Daniel P. Berrange <berrange@redhat.com>
 
        Add ac97 to test case & RNG schema (Pritesh Kothari)

diff --git a/src/node_device_hal.c b/src/node_device_hal.c
index a47c42ac26a933661e4de8a5c498c154c6523c63..b214f6030a1346bf5c7abcdcea9e7636ebd2fd44 100644 (file)
--- a/src/node_device_hal.c
+++ b/src/node_device_hal.c
@@ -357,7 +357,8 @@ static int gather_capabilities(LibHalContext *ctx, const char *udi,
             goto failure;
     }
 
-    if (get_str_prop(ctx, udi, "info.subsystem", &bus_name) == 0) {
+    if (get_str_prop(ctx, udi, "info.subsystem", &bus_name) == 0 ||
+        get_str_prop(ctx, udi, "linux.subsystem", &bus_name) == 0) {
         rv = gather_capability(ctx, udi, bus_name, &caps);
         if (rv != 0)
             goto failure;