diff options
author | Michael Janczyk | 2009-11-04 16:52:49 +0100 |
---|---|---|
committer | Michael Janczyk | 2009-11-04 16:52:49 +0100 |
commit | 1da558c28b13850aabca7392bcf6d2c9fe4d6f21 (patch) | |
tree | 57289afe258428d7ccb127d5dbe1553d30f4ed98 | |
parent | git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3197 95ad53e4-c2... (diff) | |
download | core-1da558c28b13850aabca7392bcf6d2c9fe4d6f21.tar.gz core-1da558c28b13850aabca7392bcf6d2c9fe4d6f21.tar.xz core-1da558c28b13850aabca7392bcf6d2c9fe4d6f21.zip |
bugfix cpu cores
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3198 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r-- | os-plugins/plugins/vmchooser/files/run-virt.sh | 3 | ||||
-rw-r--r-- | os-plugins/plugins/vmware/files/run-virt.include | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/os-plugins/plugins/vmchooser/files/run-virt.sh b/os-plugins/plugins/vmchooser/files/run-virt.sh index a905c9d9..08d43fe4 100644 --- a/os-plugins/plugins/vmchooser/files/run-virt.sh +++ b/os-plugins/plugins/vmchooser/files/run-virt.sh @@ -103,6 +103,9 @@ parallel=$(grep -io '<parport param=.*"' ${xml} | awk -F '"' '{ print $2 }') # Declaration of default variables ############################################################################### +# cpu cores +cpu_cores="${cpu_cores}" + # Get total amount of memory installed in your machine totalmem=$(expr $(grep -i "memtotal" /proc/meminfo | awk '{print $2}') / 1024) permem=60 diff --git a/os-plugins/plugins/vmware/files/run-virt.include b/os-plugins/plugins/vmware/files/run-virt.include index f2d45b83..6ad97b34 100644 --- a/os-plugins/plugins/vmware/files/run-virt.include +++ b/os-plugins/plugins/vmware/files/run-virt.include @@ -52,7 +52,7 @@ mks.enable3d = \"${enable3d}\"" >>${conffile} esac case "$vmversion" in 3.*|7.*) - nunumvcpus=$(expr ${cpu_cores} \* ${cpu_cores}) + numvcpus="${cpu_cores}" # svga_autodetect="FALSE" # if defined manual, see below echo " # version specific stuff - ver. 3.*|7.* @@ -76,7 +76,7 @@ displayName = \"${displayname}\" guestOS = \"${vmostype}\" # CPU/MEM -numvcpus = \"${nunumvcpus}\" +numvcpus = \"${numvcpus}\" memsize = \"${mem}\" MemAllowAutoScaleDown = \"FALSE\" MemTrimRate = \"-1\" |