From 240c4b062a4e8bf9e76fbee5217646385a4caa58 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 18 Mar 2016 15:05:56 +0100
Subject: [run-virt/vmware] Error messages if mounting in win fails, fallback
 logic

---
 .../scripts/includes/setup_virtual_floppy.inc       |   6 +++---
 .../data/opt/openslx/vmchooser/data/openslx.exe     | Bin 57344 -> 58368 bytes
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'remote/modules/run-virt/data')

diff --git a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
index 2fdebf4c..48033d41 100644
--- a/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
+++ b/remote/modules/run-virt/data/opt/openslx/scripts/includes/setup_virtual_floppy.inc
@@ -41,11 +41,11 @@ touch "${SHARES}"
 chmod 0600 "${SHARES}"
 if pwdaemon --query "${TMPHOME}/.pwsocket" > "${SHARES}"; then
 	sed -i 's/^/192.168.101.1\t/' "${SHARES}" # TODO: Depending on nettype (in case we have != nat some day)
-	if [ -e "${TMPHOME}/.home" ]; then
+	if [ "${SHARE_REMAP_MODE}" = 1 -o "${SHARE_REMAP_MODE}" = 2 ] && [ -e "${TMPHOME}/.home" ]; then
 		NETHOME=$(cat "${TMPHOME}/.home")
-		[ -z "$SLX_HOME_DRIVE" ] && SLX_HOME_DRIVE="H:"
+		[ -z "$SHARE_HOME_DRIVE" ] && SHARE_HOME_DRIVE="H:"
 		# Tab between items, so spaces can be used!
-		echo "${NETHOME}	${SLX_HOME_DRIVE}	Home-Verzeichnis" >> "${SHARES}"
+		echo "${NETHOME}	${SHARE_HOME_DRIVE}	Home-Verzeichnis" >> "${SHARES}"
 	fi
 	for VAR in ${!SLX_SHARE_*}; do
 		echo "${!VAR}" >> "${SHARES}"
diff --git a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe
index 7b71ba90..0123d474 100755
Binary files a/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe and b/remote/modules/run-virt/data/opt/openslx/vmchooser/data/openslx.exe differ
-- 
cgit v1.2.3-55-g7522