pedro/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed global explorers on OSX

Browse source
This commit is contained in:
Manuel Hutter 2014-06-17 19:04:22 +02:00
parent 7674cf139b
commit c36fba4b99
3 changed files with 44 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
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")
case "$os" in
"macosx")
echo "$(sysctl -n hw.physicalcpu)"
;;
*)
if [ -r /proc/cpuinfo ]; then
cores="$(cat /proc/cpuinfo | grep "core id" | sort | uniq | wc -l)" cores="$(cat /proc/cpuinfo | grep "core id" | 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

13
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")
case "$os" in
"macosx")
echo "$(system_profiler SPHardwareDataType | grep "Number of Processors" | awk -F': ' '{print $2}')"
;;
*)
if [ -r /proc/cpuinfo ]; then
sockets="$(cat /proc/cpuinfo | grep "physical id" | sort | uniq | wc -l)" sockets="$(cat /proc/cpuinfo | grep "physical id" | 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

14
cdist/conf/explorer/memory
View file

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