diff options
| author | T(A)ILS developers <amnesia@boum.org> | 2011-02-16 14:52:39 +0100 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2011-03-09 17:59:21 +0100 |
| commit | 46639f899c793aa89958331430132d7bc0df691c (patch) | |
| tree | f32ae6b1eb376fe06833982c4cc7e58856416b69 /scripts | |
| parent | 875b4ce72f5f2748a341e234e4e10b2ded4c0def (diff) | |
| download | live-boot-46639f899c793aa89958331430132d7bc0df691c.tar.gz live-boot-46639f899c793aa89958331430132d7bc0df691c.zip | |
Fixing remaining fromiso= bug.
Taking care that the filesystem kernel module is loaded before issuing
the mount command.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/live | 15 |
1 files changed, 10 insertions, 5 deletions
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 |