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

Fixed memtotal for 64bits NetBSD systems

Browse Source
This commit is contained in:
Emile 'iMil' Heitor 2013-05-11 12:52:17 +02:00
parent 53d2ac059a
commit 9c53137777
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

@ -298,6 +298,8 @@ def _memdata(osdata):
sysctl = salt.utils.which('sysctl')
if sysctl:
mem = __salt__['cmd.run']('{0} -n hw.physmem'.format(sysctl))
if (osdata['kernel'] == 'NetBSD' and mem.startswith('-')):
mem = __salt__['cmd.run']('{0} -n hw.physmem64'.format(sysctl))
grains['mem_total'] = str(int(mem) / 1024 / 1024)
elif osdata['kernel'] == 'SunOS':
prtconf = '/usr/sbin/prtconf 2>/dev/null'