valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-06 16:45:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge conflict

Browse Source
This commit is contained in:
Gareth J. Greenaway 2015-01-01 20:13:27 -08:00
parent 38d4fec056
commit 2c7c5d3f81
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

@ -163,7 +163,7 @@ def mounted(name,
if uuid_device and uuid_device not in device_list:
device_list.append(uuid_device)
if opts:
mount_invisible_options = ['defaults', 'comment', 'nobootwait', 'reconnect', 'delay_connect']
mount_invisible_options = ['defaults', 'comment', 'nobootwait', 'reconnect', 'delay_connect', 'nofail', 'password']
for opt in opts:
comment_option = opt.split('=')[0]
if comment_option == 'comment':
@ -184,7 +184,9 @@ def mounted(name,
mount_result = __salt__['mount.mount'](real_name, device, mkmnt=mkmnt, fstype=fstype, opts=opts)
ret['result'] = mount_result
else:
raise SaltInvocationError('Unable to unmount {0}: {1}.'.format(real_name, unmount_result))
ret['result'] = False
ret['comment'] = 'Unable to unmount {0}: {1}.'.format(real_name, unmount_result)
return ret
else:
ret['changes']['umount'] = "Forced remount because " \
+ "options ({0}) changed".format(opt)