[SCM] live-boot branch, debian-next, updated. debian/3.0_a27-1-4-gb18a6b7

[Tails developers]

The following commit has been merged in the debian-next branch:
commit b18a6b7888d67ff6397d1a7d38ff9083eff2cf01
Author: Tails developers <amnesia at boum.org>
Date:   Tue Apr 10 11:48:29 2012 +0200

    Improving robustness of fromiso cleanup process with is_mountpoint.

diff --git a/scripts/live b/scripts/live
index 322656e..371fac4 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1595,8 +1595,14 @@ mountroot ()
 	# rid of it when running from RAM
 	if [ -n "$FROMISO" ] && [ "${TORAM}" ]
 	then
-	  losetup -d /dev/loop0
-	  grep -q /live/fromiso /proc/mounts && umount /live/fromiso
+		losetup -d /dev/loop0
+
+		if is_mountpoint /live/fromiso
+		then
+			umount /live/fromiso
+			rmdir --ignore-fail-on-non-empty /live/fromiso \
+				>/dev/null 2>&1 || true
+		fi
 	fi
 
 	if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]

-- 
live-boot