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

ansible-modules-core #530 fix - Mount module does not accept spaces in mount point path

Browse source
This commit is contained in:
sysadmin75 2014-12-27 20:08:25 -05:00 committed by Matt Clay
parent 3048626d6e
commit f096359608
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -116,6 +116,11 @@ def set_mount(**kwargs):
) )
args.update(kwargs) args.update(kwargs)
# save the mount name before space replacement
origname = args['name']
# replace any space in mount name with '\040' to make it fstab compatible (man fstab)
args['name'] = args['name'].replace(' ', r'\040')
new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n' new_line = '%(src)s %(name)s %(fstype)s %(opts)s %(dump)s %(passno)s\n'
to_write = [] to_write = []
@ -160,7 +165,8 @@ def set_mount(**kwargs):
if changed: if changed:
write_fstab(to_write, args['fstab']) write_fstab(to_write, args['fstab'])
return (args['name'], changed) # mount function needs origname
return (origname, changed)
def unset_mount(**kwargs): def unset_mount(**kwargs):
@ -175,6 +181,11 @@ def unset_mount(**kwargs):
) )
args.update(kwargs) args.update(kwargs)
# save the mount name before space replacement
origname = args['name']
# replace any space in mount name with '\040' to make it fstab compatible (man fstab)
args['name'] = args['name'].replace(' ', r'\040')
to_write = [] to_write = []
changed = False changed = False
for line in open(args['fstab'], 'r').readlines(): for line in open(args['fstab'], 'r').readlines():
@ -203,7 +214,8 @@ def unset_mount(**kwargs):
if changed: if changed:
write_fstab(to_write, args['fstab']) write_fstab(to_write, args['fstab'])
return (args['name'], changed) # umount needs origname
return (origname, changed)
def mount(module, **kwargs): def mount(module, **kwargs):