[PATCH 2/5 rhel7-branch] Network spoke: show global ipv6 addresses (#1005681)

Radek Vykydal rvykydal at redhat.com
Tue Sep 10 09:37:38 UTC 2013


master commit e0ba94b4c7abb6d1c7aa060a123eb1dbfecf15a5
---
 pyanaconda/ui/gui/spokes/network.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pyanaconda/ui/gui/spokes/network.py b/pyanaconda/ui/gui/spokes/network.py
index a05e1a2..eaee0f3 100644
--- a/pyanaconda/ui/gui/spokes/network.py
+++ b/pyanaconda/ui/gui/spokes/network.py
@@ -760,10 +760,13 @@ class NetworkControlBox(object):
         ipv6_addr = None
         if ipv6cfg:
             config = dbus.SystemBus().get_object(NM_SERVICE, ipv6cfg.get_path())
-            addr, prefix, gw = getNMObjProperty(config, ".IP6Config",
-                                                "Addresses")[0]
-            ipv6_addr = nm_dbus_ay_to_ipv6(addr)
-        self._set_device_info_value(dt, "ipv6", ipv6_addr)
+            addr6_str = ""
+            for addr, _prefix, _gw in getNMObjProperty(config, ".IP6Config", "Addresses"):
+                ipv6_addr = nm_dbus_ay_to_ipv6(addr)
+                if not ipv6_addr.startswith("fe80:"):
+                    addr6_str += "%s\n" % ipv6_addr
+
+        self._set_device_info_value(dt, "ipv6", addr6_str.strip())
 
         if ipv4cfg and ipv6_addr:
             self.builder.get_object("heading_%s_ipv4" % dt).set_label(_("IPv4 Address"))
-- 
1.7.11.7



More information about the anaconda-patches mailing list