hal: Branch 'master'

[Danny Kukawka]

 hald/linux/device.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 28f299f8acf16eddc68b17ab43f4a30d2cd97b47
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Apr 17 19:42:45 2008 +0200

    fixed UDI generation for VMBus devices
    
    Fixed UDI generation for VMBus devices. Use only vmbus.bus_id
    since it has already this format 'vmbus_<bus_number>_<device_num>'

diff --git a/hald/linux/device.c b/hald/linux/device.c
index 80dd39e..368b1cc 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -3769,9 +3769,8 @@ vmbus_compute_udi (HalDevice *d)
 	gchar udi[256];
 	
 	hal_util_compute_udi (hald_get_gdl(), udi, sizeof (udi),
-			      "/org/freedesktop/Hal/devices/vmbus_%s_%s",
-			      hal_device_property_get_string (d, "vmbus.bus_id"),
-			      hal_device_property_get_string (d, "vmbus.device_id"));
+			      "/org/freedesktop/Hal/devices/_%s",
+			      hal_device_property_get_string (d, "vmbus.bus_id"));
 
 	hal_device_set_udi (d, udi);