diff --git a/debian/changelog b/debian/changelog index 6f2adb6a..7b9ec0f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,7 @@ debian-cd (2.2.20) UNRELEASED; urgency=low from CD. - Add 2.6 kernels to ia64 netinst CDs (and incidentially, update to 2.4.27). + - Drop i386 floppies that have gone away in d-i. * Stephen R. Marenka - Add support for m68k reorganization. - Bump m68k 2.4 kernels to 2.4.27. diff --git a/tools/boot/sarge/boot-i386 b/tools/boot/sarge/boot-i386 index cf670245..10ffd8cf 100755 --- a/tools/boot/sarge/boot-i386 +++ b/tools/boot/sarge/boot-i386 @@ -51,7 +51,7 @@ DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img" if [ "$INSTALLER_CD" =! 1 ] && [ "$INSTALLER_CD" =! 2 ]; then # Note that floppy/access/drivers.img was renamed to cd-drivers, both # present for the transition. - EXTRA_DISK_IMAGES="floppy/net-drivers.img floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img floppy/access/drivers.img floppy/asian-root.img floppy/cyrillic-root.img floppy/mideast-root.img" + EXTRA_DISK_IMAGES="floppy/net-drivers.img floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img floppy/access/drivers.img" fi # Download boot images and floppies.