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

Merge pull request #22022 from garethgreenaway/21992_2014_7_tmpfs_bind_mount

Browse Source 
more fixes to mount.py state module
This commit is contained in:
jfindlay 2015-03-25 20:34:48 -06:00
commit decd53bfd2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/states/mount.py
View File

@ -114,8 +114,9 @@ def mounted(name,
real_device = _real_device
else:
# Remote file systems act differently.
opts = list(set(opts + active[_device]['opts'] + active[_device]['superopts']))
active[real_name]['opts'].append('bind')
if _device in active:
opts = list(set(opts + active[_device]['opts'] + active[_device]['superopts']))
active[real_name]['opts'].append('bind')
real_device = active[real_name]['device']
else:
real_device = os.path.realpath(device)
@ -195,6 +196,7 @@ def mounted(name,
'soft',
'auto',
'users',
'bind',
]
# options which are provided as key=value (e.g. password=Zohp5ohb)
mount_invisible_keys = [