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

Merge pull request #3242 from bcoca/mount_findbin

Browse source 
now mount/unmount binaries are searched for instead of hardcoded
This commit is contained in:
Michael DeHaan 2013-06-17 20:31:12 -07:00
commit 6d19150bb1
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
library/system/mount
View file

@ -197,12 +197,13 @@ def unset_mount(**kwargs):
def mount(module, **kwargs): def mount(module, **kwargs):
""" mount up a path or remount if needed """ """ mount up a path or remount if needed """
mount_bin = module.get_bin_path('mount')
name = kwargs['name'] name = kwargs['name']
if os.path.ismount(name): if os.path.ismount(name):
cmd = [ '/bin/mount', '-o', 'remount', name ] cmd = [ mount_bin , '-o', 'remount', name ]
else: else:
cmd = [ '/bin/mount', name ] cmd = [ mount_bin, name ]
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
if rc == 0: if rc == 0:
@ -213,8 +214,9 @@ def mount(module, **kwargs):
def umount(module, **kwargs): def umount(module, **kwargs):
""" unmount a path """ """ unmount a path """
umount_bin = module.get_bin_path('umount')
name = kwargs['name'] name = kwargs['name']
cmd = ['/bin/umount', name] cmd = [umount_bin, name]
rc, out, err = module.run_command(cmd) rc, out, err = module.run_command(cmd)
if rc == 0: if rc == 0: