From: T(A)ILS developers <amnesia@boum.org>
Date: Wed, 16 Feb 2011 13:52:39 +0000 (+0100)
Subject: Fixing remaining fromiso= bug.
X-Git-Tag: debian/3.0_a15-1~2
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=46639f899c793aa89958331430132d7bc0df691c;p=live-boot-grml.git

Fixing remaining fromiso= bug.

Taking care that the filesystem kernel module is loaded before issuing
the mount command.
---

diff --git a/scripts/live b/scripts/live
index 3888f03..8761bd7 100755
--- a/scripts/live
+++ b/scripts/live
@@ -1578,11 +1578,16 @@ check_dev ()
 		then
 			echo "Warning: device for bootoption isofrom= ($FROMISO) not found.">>/live-boot.log
 		else
-			mkdir /isofrom
-			mount -t auto "$ISO_DEVICE" /isofrom
-			ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
-			loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
-			devname="${loopdevname}"
+			fs_type=$(get_fstype "${ISO_DEVICE}")
+			if is_supported_fs ${fs_type}
+			then
+				mkdir /isofrom
+				mount -t $fs_type "$ISO_DEVICE" /isofrom
+				ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
+				loopdevname=$(setup_loop "/isofrom/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+				devname="${loopdevname}"
+			else
+				echo "Warning: unable to mount $ISO_DEVICE." >>/live.log
 		fi
 	fi