[SCM] live-boot branch, debian-next, updated. debian/3.0_a14-1-7-g8e71042
Daniel Baumann
daniel at debian.org
Thu Feb 17 14:22:59 UTC 2011
The following commit has been merged in the debian-next branch:
commit 8e71042ed5b1688e76ada50e57b5026d26a33e01
Author: T(A)ILS developers <amnesia at boum.org>
Date: Wed Feb 16 14:52:39 2011 +0100
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
--
live-boot
More information about the debian-live-changes
mailing list