diff options
Diffstat (limited to 'os-plugins/plugins/virtualbox')
-rw-r--r-- | os-plugins/plugins/virtualbox/files/machine.include | 4 | ||||
-rw-r--r-- | os-plugins/plugins/virtualbox/files/run-virt.include | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/os-plugins/plugins/virtualbox/files/machine.include b/os-plugins/plugins/virtualbox/files/machine.include index 1544d4d6..8d1e23c4 100644 --- a/os-plugins/plugins/virtualbox/files/machine.include +++ b/os-plugins/plugins/virtualbox/files/machine.include @@ -15,8 +15,8 @@ cat << EOF > "${machconfig}" </ExtraData> <Hardware version="2"> <CPU count="${cpu_cores}"> - <HardwareVirtEx enabled="true" exclusive="true"/> - <HardwareVirtExNestedPaging enabled="false"/> + <HardwareVirtEx enabled="${enablevt}" exclusive="true"/> + <HardwareVirtExNestedPaging enabled="${npaging}"/> <HardwareVirtExVPID enabled="false"/> <PAE enabled="true"/> </CPU> diff --git a/os-plugins/plugins/virtualbox/files/run-virt.include b/os-plugins/plugins/virtualbox/files/run-virt.include index 4a1e2c14..a4ebe222 100644 --- a/os-plugins/plugins/virtualbox/files/run-virt.include +++ b/os-plugins/plugins/virtualbox/files/run-virt.include @@ -94,10 +94,6 @@ 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 @@ -244,6 +240,10 @@ 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 @@ -255,6 +255,14 @@ case ${boot} in ;; esac +# nested paging +npaging="false" +# enable VT +enablevt="false" +# check for VT, if not available use only 1 cpu (only 1 supported) +[ ${vtflag} -eq 0 ] && cpu_cores=1 +[ ${vtflag} -eq 1 ] && enablevt="true" + # external GUI vrdpport=${remotedesktopport} |