hal: Branch 'master' - 2 commits

[David Zeuthen]

 hald/linux/device.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 515dad9d586fda57a9cc786f523bf0cda6aef3dd
Merge: 73a3729... d23638c...
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Mar 4 12:39:51 2008 -0500

    Merge branch 'master' of ssh://david@git.freedesktop.org/git/hal

commit 73a372961d6a25cad5923350210bbed1621cdbb1
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Mar 4 12:38:46 2008 -0500

    also bring back a deprecated key to unbreak NetworkManager
    
    Need to talk to dcbw and get him to fix it. Then revert this patch in
    the next release or something.

diff --git a/hald/linux/device.c b/hald/linux/device.c
index 79e566c..1026b2a 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -511,6 +511,7 @@ net_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de
 	hal_device_add_capability (d, "net");
 
 	hal_device_property_set_string (d, "net.originating_device", hal_device_get_udi (parent_dev));
+	hal_device_property_set_string (d, "net.physical_device", hal_device_get_udi (parent_dev));
 
 	ifname = hal_util_get_last_element (sysfs_path);
 	hal_device_property_set_string (d, "net.interface", ifname);