diff options
| author | Michael Janczyk | 2010-05-20 19:26:04 +0200 |
|---|---|---|
| committer | Michael Janczyk | 2010-05-20 19:26:04 +0200 |
| commit | a7e065e15feaa375bcdc03fc3868b32d4ade906a (patch) | |
| tree | 5e79b762b2562eb8032c6d92e5ccb76f589af18f /os-plugins | |
| parent | Merge branch 'master' into vmgrid (diff) | |
| download | core-a7e065e15feaa375bcdc03fc3868b32d4ade906a.tar.gz core-a7e065e15feaa375bcdc03fc3868b32d4ade906a.tar.xz core-a7e065e15feaa375bcdc03fc3868b32d4ade906a.zip | |
accidently moved if clause to use only one core /w 64 guests on 32 bit clients
Diffstat (limited to 'os-plugins')
| -rw-r--r-- | os-plugins/plugins/virtualbox/files/run-virt.include | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/os-plugins/plugins/virtualbox/files/run-virt.include b/os-plugins/plugins/virtualbox/files/run-virt.include index a4ebe222..f8a6ff79 100644 --- a/os-plugins/plugins/virtualbox/files/run-virt.include +++ b/os-plugins/plugins/virtualbox/files/run-virt.include @@ -94,6 +94,10 @@ case "${vmostype}" in writelog "This is not supported, exiting!" cleanexit 1 fi + # check if host is only 32 bit, then use only 1 cpu (only 1 supported) + if echo "${host_arch}" | grep -qE "i.86"; then + cpu_cores=1 + fi else vmostype="Linux26" fi @@ -133,7 +137,7 @@ if echo "${imgmode}" | grep -q rw; then # lock existing? if [ -e "${vmpath}.lock" ]; then writelog "This rw image is already in use." - writelog "Found lock in: ${vmpath}.lock, exiting!" + writelog "Found lock: ${vmpath}.lock, exiting!" writelog "Remove lock if you are sure that this is not the case" cleanexit 1 # image rw? @@ -240,10 +244,6 @@ case ${boot} in writelog "Network boot won't work, exiting!" cleanexit 1 fi - # check if host is only 32 bit, then use only 1 cpu (only 1 supported) - if echo "${host_arch}" | grep -qE "i.86"; then - cpu_cores=1 - fi for i in $(ls ${virtualbox_tftpdir}); do ln -sf ${virtualbox_tftpdir}/${i} ${confdir}/TFTP/${i} done |