cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Force BSDs to use umount/mount instead of trying to use remount. (#5715)

Browse source 
* Force BSDs to use umount/mount instead of trying to use remount.

Fixes #5591

* Initialize out and err
This commit is contained in:
Toshio Kuratomi 2016-11-23 13:21:26 -08:00 committed by Matt Clay
parent da9adccb02
commit b95f483b8d
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lib/ansible/modules/system/mount.py
View file

@ -366,16 +366,26 @@ def remount(module, mount_bin, args):
cmd += _set_fstab_args(args) cmd += _set_fstab_args(args)
cmd += [ args['name'], ] cmd += [ args['name'], ]
out = err = ''
try: try:
if get_platform().lower().endswith('bsd'):
# Note: Forcing BSDs to do umount/mount due to BSD remount not
# working as expected (suspect bug in the BSD mount command)
# Interested contributor could rework this to use mount options on
# the CLI instead of relying on fstab
# https://github.com/ansible/ansible-modules-core/issues/5591
rc = 1
else:
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
except: except:
rc = 1 rc = 1
if rc != 0: if rc != 0:
msg = out+err msg = out + err
if ismount(args['name']): if ismount(args['name']):
rc, msg = umount(module, args['name']) rc, msg = umount(module, args['name'])
if rc == 0: if rc == 0:
rc,msg = mount(module, args) rc, msg = mount(module, args)
return rc, msg return rc, msg
# Note if we wanted to put this into module_utils we'd have to get permission # Note if we wanted to put this into module_utils we'd have to get permission