X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive;fp=scripts%2Flive;h=9cef068c1b10e513fc096736a208f9243191f271;hb=149e490b0d32724090f135f4654292231e6f28d6;hp=f25fbad8fd69a2f88b3ef17d4acaf899b0527b07;hpb=285412f944154e428f9da10f0e270aa85afe9276;p=live-boot-grml.git

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}" ]