diff --git a/salt/grains/core.py b/salt/grains/core.py index 7e4835fbb919..83a594775994 100644 --- a/salt/grains/core.py +++ b/salt/grains/core.py @@ -713,10 +713,13 @@ def _virtual(osdata): if maker.startswith('OpenStack'): grains['virtual'] = 'OpenStack' if sysctl: + hv_vendor = __salt__['cmd.run']('{0} hw.hv_vendor'.format(sysctl)) model = __salt__['cmd.run']('{0} hw.model'.format(sysctl)) jail = __salt__['cmd.run']( '{0} -n security.jail.jailed'.format(sysctl) ) + if 'bhyve' in hv_vendor: + grains['virtual'] = 'bhyve' if jail == '1': grains['virtual_subtype'] = 'jail' if 'QEMU Virtual CPU' in model: