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 #21994 from twangboy/os_ver_15051

Browse Source 
Used WMI to detect real osversion in Windows
This commit is contained in:
jfindlay 2015-03-25 11:50:22 -06:00
commit c76ea26943
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/grains/core.py
View File

@ -893,8 +893,9 @@ def os_data():
# pylint: enable=unpacking-non-sequence # pylint: enable=unpacking-non-sequence
if salt.utils.is_windows(): if salt.utils.is_windows():
wmi_c = wmi.WMI()
grains['osrelease'] = grains['kernelrelease'] grains['osrelease'] = grains['kernelrelease']
grains['osversion'] = grains['kernelrelease'] = version grains['osversion'] = grains['kernelrelease'] = wmi_c.Win32_OperatingSystem()[0].Version
grains['os'] = 'Windows' grains['os'] = 'Windows'
grains['os_family'] = 'Windows' grains['os_family'] = 'Windows'
grains.update(_memdata(grains)) grains.update(_memdata(grains))