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

fixed issue where user option is internally transformed to username which is what /proc/mounts reports for cifs mounts

Browse Source
This commit is contained in:
Robert Fach 2015-02-26 14:55:39 +00:00 committed by C. R. Oldham
parent 983d615d5e
commit e8eb6fe6ff
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/states/mount.py
View File

@ -229,6 +229,9 @@ def mounted(name,
if size_match.group('size_unit') == 'g': if size_match.group('size_unit') == 'g':
converted_size = int(size_match.group('size_value')) * 1024 * 1024 converted_size = int(size_match.group('size_value')) * 1024 * 1024
opt = "size={0}k".format(converted_size) opt = "size={0}k".format(converted_size)
# make cifs option user synonym for option username which is reported by /proc/mounts
if fstype in ['cifs'] and opt.split('=')[0] == 'user':
opt = "username={0}".format(opt.split('=')[1])
if opt not in active[real_name]['opts'] \ if opt not in active[real_name]['opts'] \
and opt not in active[real_name]['superopts'] \ and opt not in active[real_name]['superopts'] \