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

Merge pull request #15598 from xenophonf/fixed-freebsd-virtualpc-detection-issue-15594

Browse Source 
Fixed 'virtual: VirtualPC' setting on FreeBSD in salt/grains/core.py
This commit is contained in:
Erik Johnson 2014-09-08 20:07:45 -05:00
commit 6736aa624d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/grains/core.py
View File

@ -635,6 +635,8 @@ def _virtual(osdata):
if maker.startswith('Xen'):
grains['virtual_subtype'] = '{0} {1}'.format(maker, product)
grains['virtual'] = 'xen'
if maker.startswith('Microsoft') and product.startswith('Virtual'):
grains['virtual'] = 'VirtualPC'
if sysctl:
model = __salt__['cmd.run']('{0} hw.model'.format(sysctl))
jail = __salt__['cmd.run'](