saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #34133 from rallytime/bp-34057

Browse source 
Back-port #34057 to 2016.3
This commit is contained in:
Mike Place 2016-06-21 08:53:46 -07:00 • committed by GitHub
commit a75386a669
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
salt/modules/mount.py
View file

@ -140,10 +140,10 @@ def _active_mounts_openbsd(ret):
'''
for line in __salt__['cmd.run_stdout']('mount -v').split('\n'):
comps = re.sub(r"\s+", " ", line).split()
nod = __salt__['cmd.run_stdout']('ls -l {0}'.format(comps[0]))
nod = ' '.join(nod.split()).split(" ")
parens = re.findall(r'\((.*?)\)', line, re.DOTALL)
if len(parens) > 1:
nod = __salt__['cmd.run_stdout']('ls -l {0}'.format(comps[0]))
nod = ' '.join(nod.split()).split(" ")
ret[comps[3]] = {'device': comps[0],
'fstype': comps[5],
'opts': _resolve_user_group_names(parens[1].split(", ")),
@ -153,7 +153,7 @@ def _active_mounts_openbsd(ret):
else:
ret[comps[2]] = {'device': comps[0],
'fstype': comps[4],
'opts': _resolve_user_group_names(parens[1].split(", "))}
'opts': _resolve_user_group_names(parens[0].split(", "))}
return ret