[PATCH 04/10] Return correct nm_device_setting_value for bonds and vlans (#906272)

Radek Vykydal rvykydal at redhat.com
Mon Mar 11 13:15:26 UTC 2013


---
 pyanaconda/nm.py | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pyanaconda/nm.py b/pyanaconda/nm.py
index ab497a2..c689a01 100644
--- a/pyanaconda/nm.py
+++ b/pyanaconda/nm.py
@@ -264,8 +264,16 @@ def _device_settings(name):
        Exceptions:
        UnknownDeviceError - device was not found
     """
-    hwaddr_str = nm_device_hwaddress(name)
-    return _settings_for_hwaddr(hwaddr_str)
+    devtype = nm_device_type(name)
+    if devtype == NetworkManager.DeviceType.BOND:
+        settings = _find_settings(name, 'bond', 'interface-name')
+    elif devtype == NetworkManager.DeviceType.VLAN:
+        settings = _find_settings(name, 'vlan', 'interface-name')
+    else:
+        hwaddr_str = nm_device_hwaddress(name)
+        settings = _settings_for_hwaddr(hwaddr_str)
+
+    return settings
 
 def _settings_for_ap(ssid):
     """Return object path of wireless access point settings.
-- 
1.7.11.7



More information about the anaconda-patches mailing list