no uses get_bin_path for 2nd use of ip tool (fixes reported issue with openwrt)

module needs this added to many tool invokations, but his is a start
Signed-off-by: Brian Coca <briancoca+dev@gmail.com>
reviewable/pr18780/r1
Brian Coca 12 years ago
parent 117f50dcde
commit af745d0f9a

@ -1110,7 +1110,8 @@ class LinuxNetwork(Network):
path = os.path.join(path, 'bonding', 'all_slaves_active') path = os.path.join(path, 'bonding', 'all_slaves_active')
if os.path.exists(path): if os.path.exists(path):
interfaces[device]['all_slaves_active'] = open(path).read() == '1' interfaces[device]['all_slaves_active'] = open(path).read() == '1'
output = subprocess.Popen(['/sbin/ip', 'addr', 'show', device], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0] ip_path = module.get_bin_path("ip")
output = subprocess.Popen([ip_path, 'addr', 'show', device], stdout=subprocess.PIPE, stderr=subprocess.PIPE).communicate()[0]
for line in output.split('\n'): for line in output.split('\n'):
if not line: if not line:

Loading…
Cancel
Save