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

---
 .../openslx/vmchooser/vmware/includes/create_vmware_config_file.inc | 4 +++-
 .../vmchooser/vmware/includes/create_vmware_config_file_legacy.inc  | 6 ++++--
 .../vmware/data/opt/openslx/vmchooser/vmware/includes/parse_vmx.inc | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'remote/modules/vmware/data')

diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
index 5d33ce16..b9e998ea 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file.inc
@@ -172,10 +172,12 @@ real_core_count="$cpu_cores"
 # to a different value than the virtual number of cores per virtual CPU.
 cores_per_socket="$cpu_cores"
 
-if [ "x$shfolders" != "xFALSE" ]; then
+if [ "x$shfolders" != "xFALSE" ] && [ "$SHARE_REMAP_MODE" != 1 ]; then
 	ENABLE_SHARE='sharedFolder.option = "alwaysEnabled"'
+	HGFS_DISABLED="FALSE"
 else
 	ENABLE_SHARE=''
+	HGFS_DISABLED="TRUE"
 fi
 
 [ "$mem" -ge "$MAXMEM" ] && mem="$MAXMEM"
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc
index 7418a053..7332c79a 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/create_vmware_config_file_legacy.inc
@@ -159,10 +159,12 @@ create_vmware_config_file_legacy() {
 	# to a different value than the virtual number of cores per virtual CPU.
 	cores_per_socket="$cpu_cores"
 
-	if [ "x$shfolders" != "xFALSE" ]; then
+	if [ "x$shfolders" != "xFALSE" ] && [ "$SHARE_REMAP_MODE" != 1 ]; then
 		ENABLE_SHARE='sharedFolder.option = "alwaysEnabled"'
+		HGFS_DISABLED="FALSE"
 	else
 		ENABLE_SHARE=''
+		HGFS_DISABLED="TRUE"
 	fi
 
 	[ "$mem" -ge "$MAXMEM" ] && mem="$MAXMEM"
@@ -293,7 +295,7 @@ create_vmware_config_file_legacy() {
 		mainMem.useNamedFile = "TRUE"
 		snapshot.disabled = "TRUE"
 		tools.syncTime = "TRUE"
-		isolation.tools.hgfs.disable = "FALSE"
+		isolation.tools.hgfs.disable = "$HGFS_DISABLED"
 		hgfs.mapRootShare = "TRUE"
 		isolation.tools.dnd.disable = "FALSE"
 		isolation.tools.copy.enable = "TRUE"
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 cdc2710c..a8136513 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
@@ -97,7 +97,7 @@ HEREEND
 # Isolation tools: settings
 # It should be verified whether and when entries necessary
 cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
-isolation.tools.hgfs.disable = "FALSE"
+isolation.tools.hgfs.disable = "$HGFS_DISABLED"
 isolation.tools.dnd.disable = "FALSE"
 isolation.tools.copy.enable = "TRUE"
 isolation.tools.paste.enabled = "TRUE"
-- 
cgit v1.2.3-55-g7522