From ab4b56584bb05e433af490538fecf9916b614963 Mon Sep 17 00:00:00 2001
From: Christian Rößler
Date: Fri, 10 Aug 2018 11:13:48 +0200
Subject: [run-virt] Linux scripts: only share name linked if given.

---
 .../openslx/vmchooser/data/linux/includes/10_functions.inc  | 13 +++++++++++--
 .../vmchooser/data/linux/includes/30_mount_shares.inc       | 11 +++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)

(limited to 'core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes')

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc
index 4adc9250..8d004f48 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/10_functions.inc
@@ -102,8 +102,17 @@ function mount_share()
 	fi
 	if [ "$ERR" -eq 0 ]; then
 		logger "openslx sharemapper: Linking ${SHARELETTER} and $SHARENAME, if possible."
-		[ -n "${SHARELETTER}" ] && ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARELETTER"
-		[ -n "${SHARENAME}" ] && ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARENAME"
+#		[ -n "${SHARELETTER}" ] && ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARELETTER"
+#		[ -n "${SHARELETTER}" ] && ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARENAME"
+
+		if [ -n "${SHARENAME}" ]; then
+			ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARENAME"
+			logger "openslx sharemapper: ${SHARENAME} linked."
+		elif [ -n "${SHARELETTER}" ]; then
+			ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARELETTER"
+			logger "openslx sharemapper: No sharename found, share letter ${SHARELETTER} linked."
+		fi
+
 	else
 		logger "openslx sharemapper: deleting previously creates share mount dir $USERSHAREDIR."
 		rmdir "$USERSHAREDIR" 2>/dev/null
diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc
index 7447dd41..1254910e 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/30_mount_shares.inc
@@ -29,6 +29,17 @@ function mount_shares()
 			mounter "${MOUNTPARAM}" "${MOUNTOPTS}" "${SHAREPATH}" "${USERHOMEDIR}" 2>/dev/null 1>&2 &
 			unset USER
 			unset PASSWD
+
+			# linken: userhomedir <-sharename, userhomedir <- shareletter ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARENAME"
+			#								ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARELETTER"
+			logger "openslx sharemapper: Linking ${SHARELETTER} or ${SHARENAME}, if possible."
+			if [ -n "${SHARENAME}" ]; then
+				ln -s "$USERHOMEDIR" "${USERDESKTOP}"/"$SHARENAME"
+				logger "openslx sharemapper: ${SHARENAME} linked."
+			elif [ -n "${SHARELETTER}" ]; then
+				ln -s "$USERHOMEDIR" "${USERDESKTOP}"/"$SHARELETTER"
+				logger "openslx sharemapper: No sharename found, share letter ${SHARELETTER} linked."
+			fi
 		else
 			if [ -z "${SHARELETTER}" ]; then
 				logger "openslx sharemapper: $SHARELETTER not found. Do not know where to mount."
-- 
cgit v1.2.3-55-g7522