internet/community.general
3
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2026-05-08 06:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

use custom ismount function in mount module (#2737)

Browse Source 
* based on cpython os.path.ismount
* includes patch from http://bugs.python.org/issue2466
* fixes #2186
* when the upstream bug is fixed this should be removed/rewritten
* use ismount from module_utils
This commit is contained in:
Robin Roth
2016-04-12 17:48:42 +02:00
committed by Matt Clay
parent 075edf7bb2
commit ee06cd27b2
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ansible/modules/system/mount.py
View File

@@ -234,7 +234,7 @@ def mount(module, **kwargs):
cmd = [ mount_bin, ] cmd = [ mount_bin, ]
if os.path.ismount(name): if ismount(name):
cmd += [ '-o', 'remount', ] cmd += [ '-o', 'remount', ]
if get_platform().lower() == 'freebsd': if get_platform().lower() == 'freebsd':
@@ -311,7 +311,7 @@ def main():
if state == 'absent': if state == 'absent':
name, changed = unset_mount(module, **args) name, changed = unset_mount(module, **args)
if changed and not module.check_mode: if changed and not module.check_mode:
if os.path.ismount(name): if ismount(name):
res,msg = umount(module, **args) res,msg = umount(module, **args)
if res: if res:
module.fail_json(msg="Error unmounting %s: %s" % (name, msg)) module.fail_json(msg="Error unmounting %s: %s" % (name, msg))
@@ -325,7 +325,7 @@ def main():
module.exit_json(changed=changed, **args) module.exit_json(changed=changed, **args)
if state == 'unmounted': if state == 'unmounted':
if os.path.ismount(name): if ismount(name):
if not module.check_mode: if not module.check_mode:
res,msg = umount(module, **args) res,msg = umount(module, **args)
if res: if res:
@@ -345,7 +345,7 @@ def main():
name, changed = set_mount(module, **args) name, changed = set_mount(module, **args)
if state == 'mounted': if state == 'mounted':
res = 0 res = 0
if os.path.ismount(name): if ismount(name):
if changed and not module.check_mode: if changed and not module.check_mode:
res,msg = mount(module, **args) res,msg = mount(module, **args)
elif 'bind' in args.get('opts', []): elif 'bind' in args.get('opts', []):
@@ -375,4 +375,6 @@ def main():
# import module snippets # import module snippets
from ansible.module_utils.basic import * from ansible.module_utils.basic import *
from ansible.module_utils.ismount import *
main() main()