valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adding some checks to ensure binaries called via cmd.run are available. Per #15948.

Browse Source
This commit is contained in:
Gareth J. Greenaway 2014-09-19 08:24:05 -07:00
parent 1bdbe7fabf
commit 55f664f109
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/modules/parted.py
View File

@ -53,6 +53,8 @@ def __virtual__():
return False
if not salt.utils.which('lsblk'):
return False
if not salt.utils.which('partprobe'):
return False
return __virtualname__
@ -377,7 +379,10 @@ def mkfs(device, fs_type):
'hfs', 'hfs+', 'hfsx', 'NTFS', 'ufs']):
raise CommandExecutionError('Invalid fs_type passed to partition.mkfs')
cmd = 'mkfs.{0} {1}'.format(fs_type, device)
mkfs_cmd = 'mkfs.{0}'.format(fs_type)
if not salt.utils.which(mkfs_cmd):
return 'Error: {0} is unavailable.'
cmd = '{0} {1}'.format(mkfs_cmd, device)
out = __salt__['cmd.run'](cmd).splitlines()
return out