From 419b2b69c4b2fa169c90aa05e5c03a172d6443aa Mon Sep 17 00:00:00 2001
From: Jonathan Bauer
Date: Thu, 15 Jul 2021 16:29:59 +0200
Subject: [vmware-common] fix bwidm crashes with local caching

---
 .../openslx/vmchooser/plugins/vmware/includes/init_core.inc    | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'core/modules/vmware-common')

diff --git a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
index 01abdfd0..b968c378 100644
--- a/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
+++ b/core/modules/vmware-common/data/opt/openslx/vmchooser/plugins/vmware/includes/init_core.inc
@@ -17,11 +17,17 @@ vmw_cap_hw_version() {
 	[ "$1" -lt "$maxhardwareversion" ] && maxhardwareversion="$1"
 }
 
+# The '@' included in bwIDM usernames leads to player crashes when
+# local VM caching is active. It seems like the problems lies with the
+# folder name where vmware puts its runtime files.
+# As a workaround we just replace '@' with '-' for now.
+declare -rg VM_WORK_DIR="/tmp/virt/vmware/${USER//@/-}.$$"
+
 # Temporary disk space for logs, etc...
-declare -rg VM_REDO_DIR="/tmp/virt/vmware/${USER}.$$"
+declare -rg VM_REDO_DIR="$VM_WORK_DIR"
 
 # Dir for configs and vmem file
-declare -rg VM_CONF_DIR="/tmp/virt/vmware/${USER}.$$"
+declare -rg VM_CONF_DIR="$VM_WORK_DIR"
 
 # The VMX file of the starting VM
 declare -rg VM_RUN_FILE="${VM_CONF_DIR}/run-vmware.conf"
-- 
cgit v1.2.3-55-g7522