mirror of
https://github.com/ansible-collections/ansible.posix.git
synced 2026-01-11 07:05:27 +01:00
Merge pull request #185 from saito-hideki/issue/184
[mount] Fix boot option handling on Solaris correctly Reviewed-by: https://github.com/apps/ansible-zuul
This commit is contained in:
commit
5d0c8e40d8
2 changed files with 9 additions and 1 deletions
3
changelogs/fragments/185_mount_at_boot.yml
Normal file
3
changelogs/fragments/185_mount_at_boot.yml
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
---
|
||||
bugfixes:
|
||||
- "mount - Handle ``boot`` option on Solaris correctly (https://github.com/ansible-collections/ansible.posix/issues/184)."
|
||||
|
|
@ -180,6 +180,7 @@ from ansible.module_utils.basic import AnsibleModule
|
|||
from ansible_collections.ansible.posix.plugins.module_utils.mount import ismount
|
||||
from ansible.module_utils.six import iteritems
|
||||
from ansible.module_utils._text import to_bytes, to_native
|
||||
from ansible.module_utils.parsing.convert_bool import boolean
|
||||
|
||||
|
||||
def write_fstab(module, lines, path):
|
||||
|
|
@ -672,7 +673,7 @@ def main():
|
|||
opts='-',
|
||||
passno='-',
|
||||
fstab=module.params['fstab'],
|
||||
boot='yes'
|
||||
boot='yes' if module.params['boot'] else 'no'
|
||||
)
|
||||
if args['fstab'] is None:
|
||||
args['fstab'] = '/etc/vfstab'
|
||||
|
|
@ -834,6 +835,10 @@ def main():
|
|||
else:
|
||||
module.fail_json(msg='Unexpected position reached')
|
||||
|
||||
# If the managed node is Solaris, convert the boot value type to Boolean
|
||||
# to match the type of return value with the module argument.
|
||||
if platform.system().lower() == 'sunos':
|
||||
args['boot'] = boolean(args['boot'])
|
||||
module.exit_json(changed=changed, **args)
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue