ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-27 07:01:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Escape spaces, backslashes when create new entry in fstab (#3193)

Browse source 
Supplement to PR #1454 and issue #530.

Fixes #3192.
Fixes #1861 (introduced by PR #1454).

Signed-off-by: Konstantin Gribov <grossws@gmail.com>
This commit is contained in:
Konstantin Gribov 2016-04-25 17:09:19 +03:00 • committed by Matt Clay
commit 9284c80039
1 changed files with 7 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -98,6 +98,9 @@ def write_fstab(lines, dest):
def _escape_fstab(v): def _escape_fstab(v):
""" escape space (040), ampersand (046) and backslash (134) which are invalid in fstab fields """ """ escape space (040), ampersand (046) and backslash (134) which are invalid in fstab fields """
if isinstance(v, int):
return v
else:
return v.replace('\\', '\\134').replace(' ', '\\040').replace('&', '\\046') return v.replace('\\', '\\134').replace(' ', '\\040').replace('&', '\\046')
def set_mount(module, **kwargs): def set_mount(module, **kwargs):
@ -112,11 +115,6 @@ def set_mount(module, **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 = []
@ -156,14 +154,13 @@ def set_mount(module, **kwargs):
to_write.append(line) to_write.append(line)
if not exists: if not exists:
to_write.append(new_line % args) to_write.append(new_line % escaped_args)
changed = True changed = True
if changed and not module.check_mode: if changed and not module.check_mode:
write_fstab(to_write, args['fstab']) write_fstab(to_write, args['fstab'])
# mount function needs origname return (args['name'], changed)
return (origname, changed)
def unset_mount(module, **kwargs): def unset_mount(module, **kwargs):
@ -178,11 +175,6 @@ def unset_mount(module, **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
escaped_name = _escape_fstab(args['name']) escaped_name = _escape_fstab(args['name'])
@ -212,8 +204,7 @@ def unset_mount(module, **kwargs):
if changed and not module.check_mode: if changed and not module.check_mode:
write_fstab(to_write, args['fstab']) write_fstab(to_write, args['fstab'])
# umount needs origname return (args['name'], changed)
return (origname, changed)
def mount(module, **kwargs): def mount(module, **kwargs):