NetworkManager

Merge lp:~vorlon/network-manager/lp.199140 into lp:~network-manager/network-manager/ubuntu.0.7.1

  1. lp.199140
  2. Merge into ubuntu.0.7.1
Proposed by Steve Langasek
Status: Merged
Approved by: Alexander Sack
Approved revision: 21
Merged at revision: not available
Proposed branch: lp:~vorlon/network-manager/lp.199140
Merge into: lp:~network-manager/network-manager/ubuntu.0.7.1
Diff against target: None lines
To merge this branch: bzr merge lp:~vorlon/network-manager/lp.199140
Reviewer Review Type Date Requested Status
Alexander Sack Approve
Review via email: mp+4055@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Alexander Sack (asac) wrote :

seems to be ok. I will guard the new check with is_wired and move scope of the netdev_parent to the if block. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'changelog'
--- changelog 2009-02-25 23:48:45 +0000
+++ changelog 2009-03-02 03:38:41 +0000
@@ -5,6 +5,12 @@
5 + NETWORKMANAGER_0_7 (branch)5 + NETWORKMANAGER_0_7 (branch)
6 + Feb 25, 2009 (7f1c86e3)6 + Feb 25, 2009 (7f1c86e3)
77
8 [ Steve Langasek ]
9 * src/nm-hal-manager.c: ignore virtual 'wired' devices whose
10 originating device is /org/freedesktop/Hal/devices/computer, since
11 these are generally managed by some other daemon and network-manager
12 just gets in the way. LP: #199140.
13
8 -- Alexander Sack <asac@ubuntu.com> Thu, 26 Feb 2009 00:47:52 +010014 -- Alexander Sack <asac@ubuntu.com> Thu, 26 Feb 2009 00:47:52 +0100
915
10network-manager (0.7.1~rc1+20090220-0ubuntu2) jaunty; urgency=low16network-manager (0.7.1~rc1+20090220-0ubuntu2) jaunty; urgency=low
1117
=== added file 'patches/lp199140_dont_manage_virtual_devices.patch'
--- patches/lp199140_dont_manage_virtual_devices.patch 1970-01-01 00:00:00 +0000
+++ patches/lp199140_dont_manage_virtual_devices.patch 2009-03-02 03:38:41 +0000
@@ -0,0 +1,28 @@
1Index: network-manager-0.7.1~rc1+20090220/src/nm-hal-manager.c
2===================================================================
3--- network-manager-0.7.1~rc1+20090220.orig/src/nm-hal-manager.c
4+++ network-manager-0.7.1~rc1+20090220/src/nm-hal-manager.c
5@@ -140,7 +140,7 @@
6 is_wired_device (NMHalManager *self, const char *udi)
7 {
8 NMHalManagerPrivate *priv = NM_HAL_MANAGER_GET_PRIVATE (self);
9- char *category;
10+ char *category, *netdev_parent;
11 gboolean is_wired = FALSE;
12
13 if (libhal_device_property_exists (priv->hal_ctx, udi, "net.linux.ifindex", NULL) &&
14@@ -153,6 +153,14 @@
15 }
16 }
17
18+ if (libhal_device_property_exists (priv->hal_ctx, udi, "net.originating_device", NULL))
19+ {
20+ netdev_parent = libhal_device_get_property_string (priv->hal_ctx, udi, "net.originating_device", NULL);
21+ if (!strcmp(netdev_parent, "/org/freedesktop/Hal/devices/computer"))
22+ is_wired = FALSE;
23+ libhal_free_string (netdev_parent);
24+ }
25+
26 return is_wired;
27 }
28
029
=== modified file 'patches/series'
--- patches/series 2009-02-14 21:32:02 +0000
+++ patches/series 2009-03-02 03:38:41 +0000
@@ -9,5 +9,6 @@
9lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch9lp291902_IFUPDOWN_dont_export_connection_in_unmanaged_mode.patch
10lp303142_more_time_for_manual_registration.patch10lp303142_more_time_for_manual_registration.patch
11lp120363_smartcard_pkcs11.patch11lp120363_smartcard_pkcs11.patch
12lp199140_dont_manage_virtual_devices.patch
1213
13# debian patches14# debian patches

Subscribers

People subscribed via source and target branches