summaryrefslogtreecommitdiffstats
path: root/core/modules/vmware-common/data
diff options
context:
space:
mode:
authorJonathan Bauer2020-04-30 16:50:05 +0200
committerJonathan Bauer2020-04-30 16:50:05 +0200
commit6a5adebb970b62d32ce8e726045b3ad5d1da22ee (patch)
treed432263a90a3da318b6c7ce0b859c83bff2bd4a7 /core/modules/vmware-common/data
parentMerge branch 'master' into installer (diff)
parentkernel.wanted.config: Add USB stuff (diff)
downloadmltk-6a5adebb970b62d32ce8e726045b3ad5d1da22ee.tar.gz
mltk-6a5adebb970b62d32ce8e726045b3ad5d1da22ee.tar.xz
mltk-6a5adebb970b62d32ce8e726045b3ad5d1da22ee.zip
Merge branch 'master' into installer
Diffstat (limited to 'core/modules/vmware-common/data')
-rw-r--r--core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc12
1 files changed, 12 insertions, 0 deletions
diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc
index 97519e2d..51a65824 100644
--- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc
+++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/write_final_vmx.inc
@@ -204,6 +204,17 @@ setup_isolation() {
HEREEND
}
+setup_vnc() {
+ local passwd="$( cat /tmp/vnc-passwd )"
+ [ -z "$passwd" ] && return
+ cat >> "${TMPCONFIG}" <<-HEREEND
+ RemoteDisplay.vnc.enabled = "TRUE"
+ RemoteDisplay.vnc.port = "5901"
+ RemoteDisplay.vnc.password = "$passwd"
+ RemoteDisplay.vnc.keymap = "de"
+ HEREEND
+}
+
# Serial, parallel: Empty, nothing is being currently set. TODO later.
setup_graphics() {
@@ -292,6 +303,7 @@ write_final_vmx() {
[ "x$HGFS_DISABLED" = "xFALSE" ] && setup_shared_folders
setup_isolation
setup_graphics
+ [[ " $SLX_REMOTE_VNC " == *" vmware "* ]] && setup_vnc
finalize_hardware
# At last: Let's copy it to $VM_CONF_DIR/run-vmware.conf