diff options
| author | Simon Rettberg | 2016-03-24 19:59:57 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2016-03-24 19:59:57 +0100 |
| commit | c9a3c9693ff36f338e35c5bfeb4042dd30839577 (patch) | |
| tree | a6cc7b48cd0731662574cb2e2cf11b6a753b994d /remote/modules/vmware/data | |
| parent | [run-virt] Add user feedback (GUI) if things go wrong (diff) | |
| download | tm-scripts-c9a3c9693ff36f338e35c5bfeb4042dd30839577.tar.gz tm-scripts-c9a3c9693ff36f338e35c5bfeb4042dd30839577.tar.xz tm-scripts-c9a3c9693ff36f338e35c5bfeb4042dd30839577.zip | |
[vmware] Don't enable VT-x virtualization until we know how to check for support
Diffstat (limited to 'remote/modules/vmware/data')
| -rw-r--r-- | remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc index 1c7aa533..a77bc171 100644 --- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc +++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc @@ -128,10 +128,11 @@ if [ -n "$SLX_EXAM" ]; then fi # Enable nested virtualization if not specified in remote vmx -if [ -e "/run/hwinfo" ] && ! grep -qi '^vhv\.enable' "${TMPDIR}/${IMGUUID}"; then - . "/run/hwinfo" - [ "${HW_KVM}" = "ENABLED" ] && echo 'vhv.enable = "TRUE"' >> "${TMPDIR}/${IMGUUID}" -fi +# TODO: Some CPUs don't support VT-x nesting. Disabled until we know how to check this +#if [ -e "/run/hwinfo" ] && ! grep -qi '^vhv\.enable' "${TMPDIR}/${IMGUUID}"; then +# . "/run/hwinfo" +# [ "${HW_KVM}" = "ENABLED" ] && echo 'vhv.enable = "TRUE"' >> "${TMPDIR}/${IMGUUID}" +#fi # TODO: Need a way to check if supported by hardware before enabling! #grep -qi '^vpmc\.enable' "${TMPDIR}/${IMGUUID}" || echo 'vpmc.enable = "TRUE"' >> "${TMPDIR}/${IMGUUID}" |