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

Merge pull request #42654 from morganwillcock/zfsgrain

Browse source 
Disable ZFS in the core grain for NetBSD
This commit is contained in:
Mike Place 2017-08-01 12:52:36 -05:00 • committed by GitHub
commit 8bcefb5e67
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
salt/grains/core.py
View file

@ -2351,6 +2351,10 @@ def _zpool_data(grains):
if salt.utils.is_windows() or 'proxyminion' in __opts__:
return {}
# quickly return if NetBSD (ZFS still under development)
if salt.utils.is_netbsd():
return {}
# quickly return if no zpool and zfs command
if not salt.utils.which('zpool'):
return {}