[run-virt] Linux scripts: umounter -bugs, +webdav (fuse), KDE resolution

setting via killing kscreen_backend_launcher (KILLRESPROGS)

1 files changed, 20 insertions, 13 deletions

diff --git a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/50_umounter.inc b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/50_umounter.inc
index a4c080d2..dc92061a 100755
--- a/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/50_umounter.inc
+++ b/core/modules/run-virt/data/opt/openslx/vmchooser/data/linux/includes/50_umounter.inc
@@ -1,22 +1,29 @@
-umount_home() {
-	umount "${USERHOMEDIR}"			&& logger "openslx umounter: umounted home (${USERHOMEDIR})." \
-							|| logger "openslx umounter: could not home(${USERHOMEDIR})!"
-}
-
-umount_shares() {
-	get_shares	# fills array ROHSHARES; row 0 global infos from (shares-)CONFIGFILE,
+umount_all() {
+	local HOME
+	local WEBDAV="(webdav) "
+	local UMOUNT
+	get_shares	# fills array ROHSHARES; row 1+ share infos from (shares-)CONFIGFILE
 
-	for (( CONFIGROW = 2; CONFIGROW < ${#ROHSHARES[@]}; CONFIGROW++ )); do		# row 1 always home, so forget...
+	for (( CONFIGROW = 1; CONFIGROW < ${#ROHSHARES[@]}; CONFIGROW++ )); do		# row 1 is homedir, 2+ shares
 		SHAREPATH=$(echo "${ROHSHARES[CONFIGROW]}" | cut -f 1 -d$'\t')          # Could be a webdav share...
 		SHARENAME=$(echo "${ROHSHARES[CONFIGROW]}" | cut -f 3 -d$'\t' | sed 's/ /_/g')
-		[ -z "${SHARENAME}" ] && SHARENAME=$(echo "${ROHSHARES[CONFIGROW]}" | cut -f 2 -d$'\t' | sed 's/://g') # yields SHARELETTER
+		if [ "${SHARENAME:0:5}" == "Home-" ]; then
+			HOME="home "
+			UMOUNT="${USERHOMEDIR}"
+		else
+			HOME=""
+			# if there's no sharename let's at least try with SHARELETTER:
+			[ -z "${SHARENAME}" ] && SHARENAME=$(echo "${ROHSHARES[CONFIGROW]}" | cut -f 2 -d$'\t' | sed 's/://g')
+			UMOUNT="${USERHOME}/${SHARENAME}"
+		fi
 
 		if [ "${SHAREPATH:0:4}" == 'http' ]; then
-			fusermount -u "${USERHOME}/${SHARENAME}"	&& logger "openslx umounter: umounted ${SHARENAME}. (webdav)" \
-									|| logger "openslx umounter: could not umount ${SHARENAME}! (webdav)"
+			fusermount -u "$UMOUNT"	&& logger "openslx umounter: umounted ${HOME}${WEBDAV} ${UMOUNT}." \
+						|| logger "openslx umounter: could not umount ${HOME}${WEBDAV} ${UMOUNT}!"
 		else
-			umount "${USERHOME}/${SHARENAME}"		&& logger "openslx umounter: umounted ${SHARE}." \
-									|| logger "openslx umounter: could not umount ${SHARE}!"
+			umount "${UMOUNT}"	&& logger "openslx umounter: umounted $HOME ${UMOUNT}." \
+						|| logger "openslx umounter: could not umount ${HOME}${UMOUNT}!"
 		fi
 	done
 }
+