Try to find ip command in either /sbin or /usr/sbin

If ip is not found in either /sbin or /usr/sbin, this will return
an empty result.  It seems extremely unlikely that a linux system will
not have iproute2 installed
This commit is contained in:
Stephen Fromm 2012-08-11 12:05:08 -07:00
parent da58114c87
commit a991c43702

9
setup
View file

@ -453,8 +453,13 @@ class LinuxNetwork(Network):
ipv4_address = None,
ipv6_address = None
)
output = subprocess.Popen(['/sbin/ip','addr', 'show'], 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()