matthijs/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'osx-explorers' of https://github.com/mhutter/cdist

Browse source
This commit is contained in:
Nico Schottelius 2014-09-29 11:14:33 +02:00
commit 8a56883d83
3 changed files with 43 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
cdist/conf/explorer/cpu_cores
View file

@ -22,10 +22,19 @@
# FIXME: other system types (not linux ...) # FIXME: other system types (not linux ...)
if [ -r /proc/cpuinfo ]; then os=$("$__explorer/os")
cores="$(cat /proc/cpuinfo | grep "core id" | sort | uniq | wc -l)" case "$os" in
"macosx")
echo "$(sysctl -n hw.physicalcpu)"
;;
*)
if [ -r /proc/cpuinfo ]; then
cores="$(grep "core id" /proc/cpuinfo | sort | uniq | wc -l)"
if [ ${cores} -eq 0 ]; then if [ ${cores} -eq 0 ]; then
cores="1" cores="1"
fi fi
echo "${cores}" echo "$cores"
fi fi
;;
esac

15
cdist/conf/explorer/cpu_sockets
View file

@ -22,10 +22,19 @@
# FIXME: other system types (not linux ...) # FIXME: other system types (not linux ...)
if [ -r /proc/cpuinfo ]; then os=$("$__explorer/os")
sockets="$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)" case "$os" in
"macosx")
echo "$(system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}')"
;;
*)
if [ -r /proc/cpuinfo ]; then
sockets="$(grep "physical id" /proc/cpuinfo | sort | uniq | wc -l)"
if [ ${sockets} -eq 0 ]; then if [ ${sockets} -eq 0 ]; then
sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)" sockets="$(cat /proc/cpuinfo | grep "processor" | wc -l)"
fi fi
echo "${sockets}" echo "${sockets}"
fi fi
;;
esac

15
cdist/conf/explorer/memory
View file

@ -22,6 +22,15 @@
# FIXME: other system types (not linux ...) # FIXME: other system types (not linux ...)
if [ -r /proc/meminfo ]; then os=$("$__explorer/os")
echo "$(cat /proc/meminfo | grep "MemTotal:" | awk '{print $2}')" case "$os" in
fi "macosx")
echo "$(sysctl -n hw.memsize)/1024" | bc
;;
*)
if [ -r /proc/meminfo ]; then
grep "MemTotal:" /proc/meminfo | awk '{print $2}'
fi
;;
esac