Merge pull request #27137 from jfindlay/serial

revert serial grain regression
This commit is contained in:
Mike Place 2015-09-15 15:52:25 -06:00
commit 72fad569b0

View file

@ -1695,7 +1695,7 @@ def _hw_data(osdata):
for serial in ('system-serial-number', 'chassis-serial-number', 'baseboard-serial-number'):
serial = __salt__['smbios.get'](serial)
if serial is not None:
grains['serial'] = serial
grains['serialnumber'] = serial
break
elif osdata['kernel'] == 'FreeBSD':
# On FreeBSD /bin/kenv (already in base system)