Merge pull request #854 from sfromm/fixes

A couple fixes for setup module
2012-08-12 05:16:05 -07:00 · 2012-08-12 05:16:05 -07:00 · 2adff56ef5
commit 2adff56ef5
parent 00c28e2810 c4ce5f9497
1 changed files with 7 additions and 2 deletions
--- a/library/setup
+++ b/library/setup
@ -453,8 +453,13 @@ class LinuxNetwork(Network):
            ipv4_address = None, 
            ipv6_address = None
        )
-
-        output = subprocess.Popen(['ip','addr'], stdout=subprocess.PIPE).communicate()[0]
+        ipbin = '/sbin/ip'
+        if not os.path.exists(ipbin):
+            if os.path.exists('/usr/sbin/ip'):
+                ipbin = '/usr/sbin/ip'
+            else:
+                return interfaces, ips
+        output = subprocess.Popen([ipbin, 'addr', 'show'], stdout=subprocess.PIPE).communicate()[0]
        for line in output.split('\n'):
            if line:
                words = line.split()