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

Last two fields in fstab are optional (fixes #43855) (#43941)

Browse source 
* Last two fields in fstab are optional
* Add changelog
This commit is contained in:
Jiri Tyr 2019-02-28 19:09:30 +00:00 • committed by Sam Doran
commit 7739b5e96c
3 changed files with 48 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -208,10 +208,14 @@ def set_mount(module, args):
continue
fields = line.split()
# Check if we got a valid line for splitting
# (on Linux the 5th and the 6th field is optional)
if (
get_platform() == 'SunOS' and len(line.split()) != 7 or
get_platform() != 'SunOS' and len(line.split()) != 6):
get_platform() == 'SunOS' and len(fields) != 7 or
get_platform() == 'Linux' and len(fields) not in [4, 5, 6] or
get_platform() not in ['SunOS', 'Linux'] and len(fields) != 6):
to_write.append(line)
continue
@ -227,16 +231,17 @@ def set_mount(module, args):
ld['passno'],
ld['boot'],
ld['opts']
) = line.split()
) = fields
else:
(
ld['src'],
ld['name'],
ld['fstype'],
ld['opts'],
ld['dump'],
ld['passno']
) = line.split()
fields_labels = ['src', 'name', 'fstype', 'opts', 'dump', 'passno']
# The last two fields are optional on Linux so we fill in default values
ld['dump'] = 0
ld['passno'] = 0
# Fill in the rest of the available fields
for i, field in enumerate(fields):
ld[fields_labels[i]] = field
# Check if we found the correct line
if (