saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

try to search for zfs if modinfo is unavailable

Browse source 
Fixes #20635.
This commit is contained in:
Justin Findlay 2015-05-28 13:48:04 -06:00
parent 071751d13f
commit 5599b67a46
1 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
salt/modules/zfs.py
View file

@ -78,11 +78,19 @@ def __virtual__():
'''
Makes sure that ZFS kernel module is loaded.
'''
kernel_module_chk = {
'FreeBSD': 'kldstat -q -m zfs',
'Linux': 'modinfo zfs',
}
cmd = kernel_module_chk.get(__grains__['kernel'], '')
on_freebsd = __grains__['kernel'] == 'FreeBSD'
on_linux = __grains__['kernel'] == 'Linux'
cmd = ''
if on_freebsd:
cmd = 'kldstat -q -m zfs'
elif on_linux:
modinfo = salt.utils.which('modinfo')
if modinfo:
cmd = '{0} zfs'.format(modinfo)
else:
cmd = 'ls /sys/module/zfs'
if cmd and salt_cmd.retcode(cmd, output_loglevel='quiet') == 0:
# Build dynamic functions and allow loading module
_build_zfs_cmd_list()