valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix use of correct tail on Solaris for active_tcp

Browse Source
This commit is contained in:
David Murphy 2017-03-20 13:26:02 -06:00
parent aec504173a
commit 5b6d33dd70
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
salt/modules/network.py
View File

@ -308,10 +308,15 @@ def _netstat_sunos():
Return netstat information for SunOS flavors
'''
log.warning('User and program not (yet) supported on SunOS')
tailpath = '/usr/xpg4/bin/tail'
if not os.path.exists(tailpath):
return 'required version of command tail does not exist: {0}'.format(tailpath)
ret = []
for addr_family in ('inet', 'inet6'):
# Lookup TCP connections
cmd = 'netstat -f {0} -P tcp -an | tail -n+5'.format(addr_family)
cmd = 'netstat -f {0} -P tcp -an | {1} -n +5'.format(addr_family, tailpath)
out = __salt__['cmd.run'](cmd, python_shell=True)
for line in out.splitlines():
comps = line.split()
@ -323,7 +328,7 @@ def _netstat_sunos():
'remote-address': comps[1],
'state': comps[6]})
# Lookup UDP connections
cmd = 'netstat -f {0} -P udp -an | tail -n+5'.format(addr_family)
cmd = 'netstat -f {0} -P udp -an | {1} -n +5'.format(addr_family, tailpath)
out = __salt__['cmd.run'](cmd, python_shell=True)
for line in out.splitlines():
comps = line.split()