From 11397f79ddb8e4aa64d93d4a9a12365394c29370 Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Wed, 30 Mar 2016 17:32:32 +0200
Subject: [vmware] Disable link/map root share if shared folders are disabled

Yes, vmware actually creates a desktop shortcut to the non-existent
shared folders hgfs-share if shared folders are disabled but the
"link root share" option is enabled...
---
 .../vmware/includes/create_vmware_config_file.inc  |  2 -
 .../includes/create_vmware_config_file_legacy.inc  |  6 +--
 .../openslx/vmchooser/vmware/includes/logging.inc  |  4 +-
 .../vmchooser/vmware/includes/parse_vmx.inc        | 43 +++++++++++-----------
 4 files changed, 27 insertions(+), 28 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 b9e998ea..9e0bfe4f 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
@@ -173,10 +173,8 @@ real_core_count="$cpu_cores"
 cores_per_socket="$cpu_cores"
 
 if [ "x$shfolders" != "xFALSE" ] && [ "$SHARE_REMAP_MODE" != 1 ]; then
-	ENABLE_SHARE='sharedFolder.option = "alwaysEnabled"'
 	HGFS_DISABLED="FALSE"
 else
-	ENABLE_SHARE=''
 	HGFS_DISABLED="TRUE"
 fi
 
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 7332c79a..df6e6f39 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
@@ -160,10 +160,10 @@ create_vmware_config_file_legacy() {
 	cores_per_socket="$cpu_cores"
 
 	if [ "x$shfolders" != "xFALSE" ] && [ "$SHARE_REMAP_MODE" != 1 ]; then
-		ENABLE_SHARE='sharedFolder.option = "alwaysEnabled"'
+		enable_share='sharedFolder.option = "alwaysEnabled"'
 		HGFS_DISABLED="FALSE"
 	else
-		ENABLE_SHARE=''
+		enable_share=
 		HGFS_DISABLED="TRUE"
 	fi
 
@@ -272,7 +272,7 @@ create_vmware_config_file_legacy() {
 		$PCIE
 
 		# shared folders
-		$ENABLE_SHARE
+		$enable_share
 		sharedFolder0.present = "$shfolders"
 		sharedFolder0.enabled = "$shfolders"
 		sharedFolder0.expiration = "never"
diff --git a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
index dc01434d..160fbc17 100644
--- a/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
+++ b/remote/modules/vmware/data/opt/openslx/vmchooser/vmware/includes/logging.inc
@@ -39,10 +39,10 @@ logging() {
 	fi
 
 	writelog "Shared folders:"
-	if [ "${ENABLE_SHARE}" = '' ]; then
+	if [ "${HGFS_DISABLED}" = "FALSE" ]; then
 		writelog "\tNo shared folders enabled."
 	else
-		writelog "\Shared folders enabled ($ENABLE_SHARE)"
+		writelog "\Shared folders enabled."
 	fi
 
 	# image
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 3796cf5f..73569a19 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
@@ -73,29 +73,30 @@ else
 fi
 
 # shared folders
-cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
-$ENABLE_SHARE
-sharedFolder0.present = "$shfolders"
-sharedFolder0.enabled = "$shfolders"
-sharedFolder0.expiration = "never"
-sharedFolder0.guestName = "$homesharename"
-sharedFolder0.hostPath = "$homesharepath"
-sharedFolder0.readAccess = "TRUE"
-sharedFolder0.writeAccess = "TRUE"
-sharedFolder1.present = "$shfolders"
-sharedFolder1.enabled = "$shfolders"
-sharedFolder1.expiration = "never"
-sharedFolder1.guestName = "$commonsharename"
-sharedFolder1.hostPath = "$commonsharepath"
-sharedFolder1.readAccess = "TRUE"
-sharedFolder1.writeAccess = "FALSE"
-sharedFolder.maxNum = "2"
-hgfs.mapRootShare = "TRUE"
-hgfs.linkRootShare = "TRUE"
-HEREEND
+if [ "$HGFS_DISABLED" = "FALSE" ]; then
+	cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
+	sharedFolder.option = "alwaysEnabled"
+	sharedFolder0.present = "$shfolders"
+	sharedFolder0.enabled = "$shfolders"
+	sharedFolder0.expiration = "never"
+	sharedFolder0.guestName = "$homesharename"
+	sharedFolder0.hostPath = "$homesharepath"
+	sharedFolder0.readAccess = "TRUE"
+	sharedFolder0.writeAccess = "TRUE"
+	sharedFolder1.present = "$shfolders"
+	sharedFolder1.enabled = "$shfolders"
+	sharedFolder1.expiration = "never"
+	sharedFolder1.guestName = "$commonsharename"
+	sharedFolder1.hostPath = "$commonsharepath"
+	sharedFolder1.readAccess = "TRUE"
+	sharedFolder1.writeAccess = "FALSE"
+	sharedFolder.maxNum = "2"
+	hgfs.mapRootShare = "TRUE"
+	hgfs.linkRootShare = "TRUE"
+	HEREEND
+fi
 
 # Isolation tools: settings
-# It should be verified whether and when entries necessary
 cat >> "$TMPDIR/$IMGUUID" <<-HEREEND
 isolation.tools.hgfs.disable = "$HGFS_DISABLED"
 isolation.tools.dnd.disable = "FALSE"
-- 
cgit v1.2.3-55-g7522