From 2c7c5d3f8149efca494050147c57ba232b5495d6 Mon Sep 17 00:00:00 2001 From: "Gareth J. Greenaway" Date: Thu, 1 Jan 2015 20:13:27 -0800 Subject: [PATCH] merge conflict --- salt/states/mount.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/salt/states/mount.py b/salt/states/mount.py index c5c0651c3d..9b1309778a 100644 --- a/salt/states/mount.py +++ b/salt/states/mount.py @@ -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)