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

Merge pull request #3750 from giantlock/develop

Browse Source 
fix conflict with rpm module
This commit is contained in:
Thomas S Hatch 2013-02-16 11:42:38 -08:00
commit 5a32e5a9ad
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
salt/grains/core.py
View File

@ -666,6 +666,7 @@ def os_data():
grains['os'] = grains['kernel'] grains['os'] = grains['kernel']
if grains['kernel'] in ('FreeBSD', 'OpenBSD'): if grains['kernel'] in ('FreeBSD', 'OpenBSD'):
grains.update(_bsd_cpudata(grains)) grains.update(_bsd_cpudata(grains))
grains['osrelease'] = grains['kernelrelease'].split('-')[0]
if not grains['os']: if not grains['os']:
grains['os'] = 'Unknown {0}'.format(grains['kernel']) grains['os'] = 'Unknown {0}'.format(grains['kernel'])
grains['os_family'] = 'Unknown' grains['os_family'] = 'Unknown'