Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Microoptimize the command to set FreeBSD's virtual grain #55739

Merged
merged 2 commits into from
Dec 28, 2019
Merged

Microoptimize the command to set FreeBSD's virtual grain #55739

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a4e0d4
Microoptimize the command to set FreeBSD's virtual grain
asomers Dec 27, 2019
334c872
Merge branch 'master' into sysctl_n
dwoz Dec 27, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions salt/grains/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,17 +1016,17 @@ def _virtual(osdata):
if maker.startswith('Bochs'):
grains['virtual'] = 'kvm'
if sysctl:
hv_vendor = __salt__['cmd.run']('{0} hw.hv_vendor'.format(sysctl))
model = __salt__['cmd.run']('{0} hw.model'.format(sysctl))
hv_vendor = __salt__['cmd.run']('{0} -n hw.hv_vendor'.format(sysctl))
model = __salt__['cmd.run']('{0} -n hw.model'.format(sysctl))
jail = __salt__['cmd.run'](
'{0} -n security.jail.jailed'.format(sysctl)
)
if 'bhyve' in hv_vendor:
grains['virtual'] = 'bhyve'
elif 'QEMU Virtual CPU' in model:
grains['virtual'] = 'kvm'
if jail == '1':
grains['virtual_subtype'] = 'jail'
if 'QEMU Virtual CPU' in model:
grains['virtual'] = 'kvm'
elif osdata['kernel'] == 'OpenBSD':
if 'manufacturer' in osdata:
if osdata['manufacturer'] in ['QEMU', 'Red Hat', 'Joyent']:
Expand Down