Merge #357765 from ~jocave/plainbox-provider-checkbox:network-info-ipv6-fix

1 files changed, 8 insertions, 5 deletions

diff --git a/bin/network_info b/bin/network_info
index 7dbe609..d3ff5df 100755
--- a/bin/network_info
+++ b/bin/network_info
@@ -40,9 +40,10 @@ def get_ip_address(interface):
 
 
 def get_ipv6_address(interface):
- cmd = ['/sbin/ip', '-6', 'addr', 'show', 'dev', interface]
+ cmd = ['/sbin/ip', '-6', '-o', 'addr', 'show',
+ 'dev', interface, 'scope', 'link']
 proc = subprocess.check_output(cmd, universal_newlines=True)
- ipaddr = proc.split()[8].strip()
+ ipaddr = proc.split()[3].strip()
 return ipaddr
 
 
@@ -57,6 +58,7 @@ def get_mac_address(interface):
 
 return address
 
+
 def get_speed(interface):
 speed_file = os.path.join(SYS_PATH, interface, 'speed')
 
@@ -79,15 +81,16 @@ def main(args):
 except IOError:
 print("IPv4: n/a")
 try:
- print("IPv6: %s" % get_ipv6_address(interface))
+ print("IPv6 (link local): %s" % get_ipv6_address(interface))
 except IOError:
- print("IPv6: n/a")
+ print("IPv6 (link local): n/a")
 except:
- print("IPv6: n/a")
+ print("IPv6 (link local): n/a")
 print("MAC: %s" % get_mac_address(interface))
 print("Connect Speed: %s\n" % get_speed(interface))
 
 return 0
 
+
 if __name__ == "__main__":
 sys.exit(main(sys.argv[1:]))