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

    Using fromiso in most places where isofrom was used.
    
    Thanks to adrian15 <adrian15sgd at gmail.com> for the patch.

diff --git a/scripts/live b/scripts/live
index f25fbad..9cef068 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1255,15 +1255,15 @@ check_dev ()
 
 		if [ "$ISO_DEVICE" = "/" ]
 		then
-			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live-boot.log
+			echo "Warning: device for bootoption fromiso= ($FROMISO) not found.">>/live-boot.log
 		else
 			fs_type=$(get_fstype "${ISO_DEVICE}")
 			if is_supported_fs ${fs_type}
 			then
-				mkdir /isofrom
-				mount -t $fs_type "$ISO_DEVICE" /isofrom
+				mkdir /fromiso
+				mount -t $fs_type "$ISO_DEVICE" /fromiso
 				ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-				loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+				loopdevname=$(setup_loop "/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 /isofrom /proc/mounts && umount /isofrom
+	  grep -q /fromiso /proc/mounts && umount /fromiso
 	fi
 
 	if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]

-- 
live-boot