summaryrefslogtreecommitdiffstats
path: root/dozentenmodul/src/main/resources
diff options
context:
space:
mode:
authorSimon Rettberg2015-09-23 16:52:16 +0200
committerSimon Rettberg2015-09-23 16:52:16 +0200
commit8bb1ae726b5108d8ff58dbfd36378fb8319dfa98 (patch)
tree05e0b880c824673bc9d7e0d8bc2c33e8c3630b28 /dozentenmodul/src/main/resources
parent[server] Fix race condition on delete; check for vmstore before up/download (diff)
downloadtutor-module-8bb1ae726b5108d8ff58dbfd36378fb8319dfa98.tar.gz
tutor-module-8bb1ae726b5108d8ff58dbfd36378fb8319dfa98.tar.xz
tutor-module-8bb1ae726b5108d8ff58dbfd36378fb8319dfa98.zip
[client] Disable login button while login is running; create legacy vmx if server doesn't supply one
Diffstat (limited to 'dozentenmodul/src/main/resources')
-rw-r--r--[-rwxr-xr-x]dozentenmodul/src/main/resources/txt/vmx_template19
1 files changed, 3 insertions, 16 deletions
diff --git a/dozentenmodul/src/main/resources/txt/vmx_template b/dozentenmodul/src/main/resources/txt/vmx_template
index 1b666d2f..87deb84f 100755..100644
--- a/dozentenmodul/src/main/resources/txt/vmx_template
+++ b/dozentenmodul/src/main/resources/txt/vmx_template
@@ -1,10 +1,10 @@
-#!/usr/bin/vmware
.encoding = "UTF-8"
config.version = "8"
+#SLX_HDD_BUS = "IDE"
+
# general hardware (ehci, 3d accel)
ehci.present = "TRUE"
-mks.gl.allowBlacklistedDrivers = "TRUE"
mks.enable3d = "FALSE"
monitor.virtual_mmu = "automatic"
@@ -12,20 +12,10 @@ monitor.virtual_exec = "automatic"
# id
virtualHW.version = "%VM_HW_VERSION%"
-displayName = "%VM_DISPLAY_NAME%"
-guestOS = "%VM_GUEST_OS%"
-
-# CPU/MEM
-numvcpus = "%VM_CPU_COUNT%"
-cpuid.coresPerSocket = "%VM_CPU_COUNT%"
-maxvcpus = "%VM_CPU_COUNT%"
-memsize = "%VM_RAM_SIZE%"
-MemAllowAutoScaleDown = "FALSE"
-MemTrimRate = "-1"
+guestOS = "other"
# ide-disks
ide0:0.present = "TRUE"
-ide0:0.fileName = "%VM_DISK_PATH%"
ide1:0.present = "TRUE"
ide1:0.autodetect = "TRUE"
ide1:0.fileName = "auto detect"
@@ -33,11 +23,8 @@ ide1:0.deviceType = "cdrom-raw"
# nics
ethernet0.present = "TRUE"
-ethernet0.addressType = "static"
ethernet0.virtualDev = "e1000"
ethernet0.connectionType = "nat"
-ethernet0.vnet = "/dev/vmnet1"
-ethernet0.address = "00:50:56:15:00:4E"
ethernet0.wakeOnPcktRcv = "FALSE"
# sound