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

Merge pull request #578 from sysadmin75/mount_dir_spaces

Browse source 
allows spaces in names for mount module
This commit is contained in:
Brian Coca 2015-06-29 18:15:06 -04:00
commit d59de3af63
1 changed files with 14 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
system/mount.py
View file

@ -116,6 +116,11 @@ def set_mount(**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'
to_write = []
@ -160,7 +165,8 @@ def set_mount(**kwargs):
if changed:
write_fstab(to_write, args['fstab'])
return (args['name'], changed)
# mount function needs origname
return (origname, changed)
def unset_mount(**kwargs):
@ -175,6 +181,11 @@ def unset_mount(**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 = []
changed = False
for line in open(args['fstab'], 'r').readlines():
@ -203,7 +214,8 @@ def unset_mount(**kwargs):
if changed:
write_fstab(to_write, args['fstab'])
return (args['name'], changed)
# umount needs origname
return (origname, changed)
def mount(module, **kwargs):