[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 e71602876fd9a5aeab8e0539bef981242384af9c
Author: Tails developers <amnesia at boum.org>
Date:   Tue Apr 10 11:44:59 2012 +0200

    Mounting fromiso filesystem on /live/fromiso instead of /fromiso.
    
    Thanks to adrian15 <adrian15sgd at gmail.com> for the patch.

diff --git a/scripts/live b/scripts/live
index 9cef068..322656e 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1260,10 +1260,10 @@ check_dev ()
 			fs_type=$(get_fstype "${ISO_DEVICE}")
 			if is_supported_fs ${fs_type}
 			then
-				mkdir /fromiso
-				mount -t $fs_type "$ISO_DEVICE" /fromiso
+				mkdir /live/fromiso
+				mount -t $fs_type "$ISO_DEVICE" /live/fromiso
 				ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-				loopdevname=$(setup_loop "/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+				loopdevname=$(setup_loop "/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
 				devname="${loopdevname}"
 			else
 				echo "Warning: unable to mount $ISO_DEVICE." >>/live-boot.log
@@ -1596,7 +1596,7 @@ mountroot ()
 	if [ -n "$FROMISO" ] && [ "${TORAM}" ]
 	then
 	  losetup -d /dev/loop0
-	  grep -q /fromiso /proc/mounts && umount /fromiso
+	  grep -q /live/fromiso /proc/mounts && umount /live/fromiso
 	fi
 
 	if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]

-- 
live-boot