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

Merge pull request #8002 from prune998/patch-2

Browse source 
added missing force flag on mkfs commandline
This commit is contained in:
Michael DeHaan 2014-08-08 13:55:19 -04:00
commit 8cab5937c3
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
library/system/filesystem
View file

@ -95,10 +95,17 @@ def main():
else:
mkfs = module.get_bin_path('mkfs', required=True)
cmd = None
if opts is None:
cmd = "%s -t %s '%s'" % (mkfs, fstype, dev)
if fstype in ['ext2', 'ext3', 'ext4', 'ext4dev']:
force_flag="-F"
elif fstype in ['btrfs']:
force_flag="-f"
else:
cmd = "%s -t %s %s '%s'" % (mkfs, fstype, opts, dev)
force_flag=""
if opts is None:
cmd = "%s -t %s %s '%s'" % (mkfs, fstype, force_flag, dev)
else:
cmd = "%s -t %s %s %s '%s'" % (mkfs, fstype, force_flag, opts, dev)
rc,_,err = module.run_command(cmd)
if rc == 0:
changed = True