From 765758598fba8a724dcee8b3919b5d9b56148829 Mon Sep 17 00:00:00 2001
From: age <bagel@systemausfall.org>
Date: Tue, 14 Jun 2005 09:34:52 +0000
Subject: [PATCH] mount test korrigiert + kleinigkeiten dazu

---
 spielspass/dmcrypt-wrapper.sh | 38 +++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/spielspass/dmcrypt-wrapper.sh b/spielspass/dmcrypt-wrapper.sh
index ccc5384..c57608e 100755
--- a/spielspass/dmcrypt-wrapper.sh
+++ b/spielspass/dmcrypt-wrapper.sh
@@ -12,12 +12,15 @@ crypt_mount()
 {
 	local partitions=`dmsetup ls | grep -v "No devices found" | cut -f1`
 	for i in $partitions; do
-	    if mount | grep -q "^/dev/mapper/$i "
-	    	then	true
-		else	echo -e "\t$i (mounting)"
-			mount "/dev/mapper/$i" &>/dev/null || echo -e " (\"mount /dev/mapper/$i\" failed)" >&2
-	      fi
-	  done
+		#if mount | grep -q "^/dev/mapper/$i$"; then	
+		# this doesn't work for me (age)
+		if [ `mount | grep -c /dev/mapper/$i` -lt 1 ]; then
+			echo -en "\t$i(mounting)"
+			mount "/dev/mapper/$i" &>/dev/null || echo -en "(failed)" >&2
+		else echo -en "\t$i(already mounted)"
+		fi
+		echo ""
+	done
 }
 
 
@@ -25,11 +28,23 @@ crypt_umount()
 {
 	local partitions=`dmsetup ls | grep -v "No devices found" | cut -f1`
 	for i in $partitions; do
-	    if mount | grep -q "^/dev/mapper/$i "
-		then	echo -e "\t$i (unmounting)"
-			umount "/dev/mapper/$i" &>/dev/null || echo -e " (\"umount /dev/mapper/$i\" failed)" >&2
-	      fi
-	  done
+		#if mount | grep -q "^/dev/mapper/$i$"; then	
+		if [ `mount | grep -c /dev/mapper/$i` -gt 0 ]; then
+			echo -en "\t$i (unmounting)"
+			umount "/dev/mapper/$i" &>/dev/null || echo -en "(failed!)" >&2
+		else echo -en "\t$i(not mounted)"
+		fi
+		echo ""
+	done
+}
+
+show_active_mappings()
+{
+	mappings=`dmsetup ls | cut -f1`
+	if [ "X$mappings" != "X" ]; then
+		echo "there are still some active mappings:"
+		echo "$mappings"
+	fi
 }
 
 
@@ -46,6 +61,7 @@ case "$ACTION" in
 	stop )
 		crypt_umount
 		/etc/init.d/cryptdisks stop
+		show_active_mappings
 		;;
 	restart|reload|force-reload )
 		$0 stop