[run-virt] Linux scripts: webdav-mount

1 files changed, 16 insertions, 6 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 e161b961..a4c080d2 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,12 +1,22 @@
 umount_home() {
-	umount /home/"${LOCALUSER}"/PERSISTENT	&& logger "openslx unmounter: umounted home (PERSISTENT)." \
-						|| logger "openslx unmounter: could not home (PERSISTENT)!"
+	umount "${USERHOMEDIR}"			&& logger "openslx umounter: umounted home (${USERHOMEDIR})." \
+							|| logger "openslx umounter: could not home(${USERHOMEDIR})!"
 }
 
 umount_shares() {
-	index=0
-	for SHARE in $(	mount | grep SHARE | tr -s ' ' | cut -f 3 -d " " ); do
-		umount "${SHARE}"	&& logger "openslx unmounter: umounted ${SHARE}." \
-					|| logger "openslx unmounter: could not umount ${SHARE}!"
+	get_shares	# fills array ROHSHARES; row 0 global infos from (shares-)CONFIGFILE,
+
+	for (( CONFIGROW = 2; CONFIGROW < ${#ROHSHARES[@]}; CONFIGROW++ )); do		# row 1 always home, so forget...
+		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 [ "${SHAREPATH:0:4}" == 'http' ]; then
+			fusermount -u "${USERHOME}/${SHARENAME}"	&& logger "openslx umounter: umounted ${SHARENAME}. (webdav)" \
+									|| logger "openslx umounter: could not umount ${SHARENAME}! (webdav)"
+		else
+			umount "${USERHOME}/${SHARENAME}"		&& logger "openslx umounter: umounted ${SHARE}." \
+									|| logger "openslx umounter: could not umount ${SHARE}!"
+		fi
 	done
 }