diff --git a/README.devel b/README.devel index b6d56851..f3c47312 100644 --- a/README.devel +++ b/README.devel @@ -64,3 +64,18 @@ Bugs / Problems : select NONFREE too. That's because contrib is broken without non-free. And the building process only allow functional packages to be added. + +Technical choices : +------------------- + +For the multiboot on the first CD of an i386 CD set, we had two options +isolinux and el-torito native multiboot. We selected isolinux +because it works well and it lets you display information to the user. +The el-torito multiboot just displays a menu with each item +being the same "2.88Mb boot image". Both multiboot mechanism may +not work on older hardware with very old BIOSes however the el-torito +one works a bit better because it's usually able to boot the first choice +without displaying the menu then. This is a non-issue since people +may still boot on CD 2,3,4,5 with the usual boot method if the multiboot +doesn't work. + diff --git a/debian/changelog b/debian/changelog index 2617b92f..4c6f5ea1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -38,8 +38,10 @@ debian-cd (2.2.14) unstable; urgency=low LOCAL, SECURITY, SECURED ... * Changed the test for ISOLINUX and MULTIBOOT to be coherent with the other boolean variables. + * Dropped old el-torito multiboot support. Documented the choice of + isolinux in README.devel. - -- Raphael Hertzog Fri, 12 Apr 2002 17:34:31 +0200 + -- Raphael Hertzog Mon, 15 Apr 2002 13:16:25 +0200 debian-cd (2.2.13) unstable; urgency=low diff --git a/tools/boot/woody/boot-i386 b/tools/boot/woody/boot-i386 index 29224914..9a7e1d5e 100755 --- a/tools/boot/woody/boot-i386 +++ b/tools/boot/woody/boot-i386 @@ -78,32 +78,6 @@ install_languages $CDDIR if [ "$N" = "1" ] || [ "$N" = "1_NONUS" ] ; then - -# # new new new # # -# The next chunk of code is only used if MULTIBOOT=1 -# Make disk1 a multi-boot image -# ElTorito supports multiple boot images -# Setup all boot-disk images (currently 4) - - -if [ "${MULTIBOOT:-0}" != "0" ] && [ "${ISOLINUX:-0}" = "0" ]; then - echo "Adding additional boot images to CD1" - - for i in 2 3 4 ; do - THISTYPE=${KTYPE[$i]} - # first copy/link the next boot block to the disk. - ln CD1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/$THISTYPE/rescue.bin boot$N/boot/${THISTYPE:-vanilla}.bin - # then the eltorito-alt-boot cmd to mkisofs_opts - echo -n "-eltorito-alt-boot " >> $N.mkisofs_opts - # then copy the mkisofs command for this image to the mkisofs_opts - echo -n "-b boot/${THISTYPE:-vanilla}.bin " >> $N.mkisofs_opts - - done -fi - - - - # populate the install directory as well (cd $CDDIR/dists/$CODENAME/main/disks-$ARCH/current/ ; \ cp -lf images-1.44/resc*.bin $CDDIR/install ; \