Fixing remaining fromiso= bug.
authorT(A)ILS developers <amnesia@boum.org>
Wed, 16 Feb 2011 13:52:39 +0000 (14:52 +0100)
committerDaniel Baumann <daniel@debian.org>
Wed, 9 Mar 2011 16:59:21 +0000 (17:59 +0100)
Taking care that the filesystem kernel module is loaded before issuing
the mount command.

scripts/live

index 3888f03..8761bd7 100755 (executable)
@@ -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