[run-virt] Linux scripts: New mount/link behaviour

2 files changed, 23 insertions, 18 deletions

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 4b31d16a..abdb0890 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
@@ -38,7 +38,7 @@ function mounter()
 					sleep $x
 					if [ "$x" -gt 6 ]; then
 						AUSGANG=1
-						logger "openslx sharemapper: timeout, could not mount ${3} to ${4}."
+						logger "openslx sharemapper: timeout, could not mount ${3} to ${4}. mount.nfs installed?"
 						break
 					fi
 					let x=x+2
@@ -72,7 +72,8 @@ function mounter()
 
 function mount_share()
 {
-	USERSHAREDIR="${USERHOME}"/SHARE_"${CONFIGROW}" # ROHSHARES: Zeilennummer; Shares >=1
+	# USERSHAREDIR="${USERHOME}"/SHARE_"${CONFIGROW}" # ROHSHARES: Zeilennummer; Shares >=1
+	USERSHAREDIR="${USERHOME}"/"${SHARENAME}"
 	if [ ! -d "$USERSHAREDIR" ]; then
 		mkdir -p "$USERSHAREDIR" 2>/dev/null
 		chown "$LOCALUSER":$(id --group "$LOCALUSER") "$USERSHAREDIR"
@@ -101,9 +102,7 @@ function mount_share()
 		unset PASSWD
 	fi
 	if [ "$ERR" -eq 0 ]; then
-		logger "openslx sharemapper: Linking ${SHARELETTER} and $SHARENAME, if possible."
-#		[ -n "${SHARELETTER}" ] && ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARELETTER"
-#		[ -n "${SHARELETTER}" ] && ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARENAME"
+		logger "openslx sharemapper: Linking ${SHARENAME}, if possible."
 
 		if [ -n "${SHARENAME}" ]; then
 			ln -s "$USERSHAREDIR" "${USERDESKTOP}"/"$SHARENAME"
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 1254910e..944bdbe8 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
@@ -30,22 +30,28 @@ function mount_shares()
 			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."
+			# linken: userhomedir <-sharename, userhomedir <- shareletter 
+			#logger "openslx sharemapper: Linking ${USERDESKTOP}/$(basename $USERHOMEDIR, if possible."
+			logger "openslx sharemapper: Linking ${USERDESKTOP}/$(basename $USERHOMEDIR), if possible."
+			# Changed: Link on Desktop no longer "Home-verz.", but same
+			# name as last part of $USERHOMEDIR (-->PERSISTENT)
+			# ln -s "$USERHOMEDIR" "${USERDESKTOP}"/"$SHARENAME"
+			ln -s "$USERHOMEDIR" "${USERDESKTOP}"/$(basename "$USERHOMEDIR")
+			logger "openslx sharemapper: "${USERDESKTOP}"/$(basename "$USERHOMEDIR") linked."
+		else
 			if [ -n "${SHARENAME}" ]; then
-				ln -s "$USERHOMEDIR" "${USERDESKTOP}"/"$SHARENAME"
-				logger "openslx sharemapper: ${SHARENAME} linked."
+				mount_share &
 			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."
-				continue
-			else
+				SHARENAME="$SHARELETTER"
 				mount_share &
+			else
+				SHARENAME="$(basename ${SHAREPATH})"
+				if [ -n "${SHARENAME}" ]; then
+					mount_share &
+				else
+					logger "openslx sharemapper: Neither SHARENAME nor SHARELETTER found - giving up! (Config row: $CONFIGROW)"
+					continue
+				fi
 			fi
 		fi
 	done