summaryrefslogtreecommitdiffstats
path: root/remote
diff options
context:
space:
mode:
authorChristian Rößler2015-09-14 15:53:41 +0200
committerChristian Rößler2015-09-14 15:53:41 +0200
commitf01c189899f43e8dc92411e43d145b59d8f25556 (patch)
tree7975e0d2f59f79ec984ffa9db2f37cb84199c70b /remote
parent[runvirt] cpu handling (maxcpu etc) (diff)
downloadtm-scripts-f01c189899f43e8dc92411e43d145b59d8f25556.tar.gz
tm-scripts-f01c189899f43e8dc92411e43d145b59d8f25556.tar.xz
tm-scripts-f01c189899f43e8dc92411e43d145b59d8f25556.zip
[vmware] parse_vmx: Now 3D settings
Diffstat (limited to 'remote')
-rw-r--r--remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc15
1 files changed, 13 insertions, 2 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 87718029..cb77cf56 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
@@ -40,6 +40,8 @@ floppy1.fileType = "file"
floppy1.fileName = "$floppy1name"
HEREEND
+writelog "numvcpus = ${cpu_cores} - maxvcpus=${real_core_count}"
+
# RAM, CPUs
cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
numvcpus = "$cpu_cores"
@@ -58,6 +60,15 @@ HEREEND
# Seriell, Parallel: Empty, nothing is being currently set. TODO later.
+# Graphics, GPU: 3D will be activated if FORCE3D is set.
+# Force3D is set in set_hardware.inc if SLX_VMWARE_3D is set in config.
+if [ -n "$FORCE3D" ]; then
+ writelog "FORCE3D set - enabling 3D in vmx file."
+ echo 'mks.gl.allowBlacklistedDrivers = "TRUE"' >> "$TMPDIR/$IMGUUID"
+else
+ writelog "FORCE3D not set - not enabling 3D in vmx file."
+fi
+
# rausziehen: Hardwareversion
# hwver=$(echo "${imghead}" | grep -m1 -ia "ddb.virtualHWVersion" | awk -F '"' '{print $2}')
# writelog "hwver: $hwver"
@@ -74,5 +85,5 @@ cp -p "$TMPDIR/$IMGUUID" "$conffile" && writelog "Copied TMPDIR/IMGUUID ${TMPDIR
( writelog "Could not copy TMPDIR/IMGUUID -$TMPDIR/$IMGUUID- to conffile ${conffile}!"; cleanexit 1 )
# TODO: Move this to cleanexit.
-rm -f "$TMPDIR/$IMGUUID" || writelog "Could not delete $TMPDIR/$IMGUUID."
-rmdir "$TMPDIR" || writelog "Could not rmdir $TMPDIR"
+# rm -f "$TMPDIR/$IMGUUID" || writelog "Could not delete $TMPDIR/$IMGUUID."
+# rmdir "$TMPDIR" || writelog "Could not rmdir $TMPDIR"