[vmchooser] Try to refine calculation of amount of memory to assign to VM

1 files changed, 8 insertions, 3 deletions

diff --git a/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env b/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env
index 4bdf63c3..e2a3e063 100755
--- a/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env
+++ b/remote/modules/vmchooser/data/etc/openslx/vmchooser/vmchooser-env
@@ -59,12 +59,17 @@ mkdir -p /var/log/samba
 #from plugins/vmchooser/80-after-plugins/virtualization.sh
 
 # change free mem
-totalmem=$(expr $(grep -i "memtotal" /proc/meminfo \
-             | awk '{print $2}') / 1024)
+mem_free=$(grep -i "^memfree:" /proc/meminfo | awk '{print $2}')
+mem_cached=$(grep -i "^cached:" /proc/meminfo | awk '{print $2}')
+mem_swapcached=$(grep -i "^swapcached:" /proc/meminfo | awk '{print $2}')
+[ -z "$mem_free" ] && mem_free="2048000"
+[ -z "$mem_cached" ] && mem_cached="0"
+[ -z "$mem_swapcached" ] && mem_swapcached="0"
+totalmem="$[ ( $mem_free + $mem_cached + $mem_swapcached ) / 1024 ]"
 echo "totalmem=${totalmem}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
 
 # cpu cores
-CPU_CORES=$(grep 'processor.*:' /proc/cpuinfo | wc -l)
+CPU_CORES=$(grep '^processor.*:' /proc/cpuinfo | wc -l)
 if [ "${CPU_CORES}" -gt "1" 2>/dev/null ]; then
   echo "cpu_cores=${CPU_CORES}" >> ${VMCHOOSER_CONF_DIR}/virtualization.conf
 else