DELTA 415886 0 30 SVN_o nrmPORTREVISION= 1ENDREP DELTA SVNZ\ZZ# Issue #33608 # https://github.com/saltstack/salt/issues/33608 --- salt/grains/core.py.orig 2016-05-25 22:30:31 UTC +++ salt/grains/core.py @@ -1422,6 +1422,7 @@ def os_data(): else: grains['os'] = grains['kernel'] if grains['kernel'] == 'FreeBSD': + grains.update(_bsd_cpudata(grains)) try: grains['osrelease'] = __salt__['cmd.run']('freebsd-version -u').split('-')[0] except salt.exceptions.CommandExecutionError: ENDREP DELTA SVNbx^To@~>yJbRS=g 홦"Hi;/|7`YPAIFvqsrVwx.0:YX~?z(Ez}gQ-=CX` Cx>aS<-'|4u1jcCWuSȥ2T-X|?K?x.(gQPsΚmY]\#U(W1>b|Bk(MK5*C)ū$-Dpڤ,>ΪLsO3lSHx)tWT[ggp৘OHN<P`"D9TW#u8$ZM(!Rڣ3͍dSfJ)+2!vZ͟Og9bA)C=jjz4pO_3u+Y^p-y8E+f{iiA1~J" /+ȹ"H+ X9#~e,ߍd,U٨(pkBREENDREP DELTA SVN!!!x^[k0_.bmS]yAp)$u/:0}'R,U=e/YI|iH!tПr̚ρNFݏA/#\C ʚB&