diff options
| author | Sebastian Schmelzer | 2011-07-21 15:11:42 +0200 |
|---|---|---|
| committer | Sebastian Schmelzer | 2011-07-21 15:11:42 +0200 |
| commit | fe3d0d891294a9d2e64f48e5b1de1427ca49abf3 (patch) | |
| tree | b8170fc0ed09baaa2aa700fa7658ec01468d24b8 /src | |
| parent | fix for empty search domains (diff) | |
| download | core-fe3d0d891294a9d2e64f48e5b1de1427ca49abf3.tar.gz core-fe3d0d891294a9d2e64f48e5b1de1427ca49abf3.tar.xz core-fe3d0d891294a9d2e64f48e5b1de1427ca49abf3.zip | |
fix enables two vms running parallel
Diffstat (limited to 'src')
| -rw-r--r-- | src/os-plugins/plugins/vmchooser/files/run-virt.sh | 5 | ||||
| -rw-r--r-- | src/os-plugins/plugins/vmware/files/run-virt.include | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/src/os-plugins/plugins/vmchooser/files/run-virt.sh b/src/os-plugins/plugins/vmchooser/files/run-virt.sh index f796271d..bf62b404 100644 --- a/src/os-plugins/plugins/vmchooser/files/run-virt.sh +++ b/src/os-plugins/plugins/vmchooser/files/run-virt.sh @@ -283,6 +283,8 @@ writelog "\tVM short name:\t\t$vm_shortname" # VM-ID static (00) VM_ID="00" +# take last two digits of current pid... +VM_ID=$(expr substr $$ $(expr ${#$} - 1) 2) # Make sure cpu_cores is not empty cpu_cores=${cpu_cores:-"1"} @@ -290,6 +292,9 @@ cpu_cores=${cpu_cores:-"1"} # Total amount of memory defined in stage 3 # TODO: Should be dependent on the setup (if diff is written to RAM ...) permem=60 +if [ "x${VMCHOOSER_FORCE_HALF_MEM}" == "x1" ]; then + permem=30 +fi # Get a result which can be divided through 4 mem=$(expr ${totalmem} / 100 \* ${permem} / 4 \* 4) if [ -n "${mainvirtmem}" ]; then diff --git a/src/os-plugins/plugins/vmware/files/run-virt.include b/src/os-plugins/plugins/vmware/files/run-virt.include index a2ac6f47..64b72f17 100644 --- a/src/os-plugins/plugins/vmware/files/run-virt.include +++ b/src/os-plugins/plugins/vmware/files/run-virt.include @@ -230,9 +230,9 @@ pref.eula.1.buildNumber = \"${vmbuild}\"" >${vmhome}/preferences # VM-ID static (0D), remove if changed to 00 VM_ID="0D" # temporary disk space for logs, etc... -redodir=/tmp/vmware/${USER} +redodir=/tmp/vmware/${USER}.$$ # dir for configs and vmem file -confdir=/tmp/vmware/${USER} +confdir=/tmp/vmware/${USER}.$$ # configfile conffile="${confdir}/run-vmware.conf" # diskfile |