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 #29883 from serge-p/patch-6

Browse source 
fix for nfs mounts in _active_mounts_openbsd()
This commit is contained in:
Mike Place 2015-12-21 11:26:49 -07:00
commit 5e44639334
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
salt/modules/mount.py
View file

@ -143,12 +143,17 @@ def _active_mounts_openbsd(ret):
nod = __salt__['cmd.run_stdout']('ls -l {0}'.format(comps[0]))
nod = ' '.join(nod.split()).split(" ")
parens = re.findall(r'\((.*?)\)', line, re.DOTALL)
ret[comps[3]] = {'device': comps[0],
if len(parens) > 1:
ret[comps[3]] = {'device': comps[0],
'fstype': comps[5],
'opts': parens[1].split(", "),
'major': str(nod[4].strip(",")),
'minor': str(nod[5]),
'device_uuid': parens[0]}
else:
ret[comps[2]] = {'device': comps[0],
'fstype': comps[4],
'opts': parens[0].split(", ")}
return ret