* Drop floppies from i386 netinst and businesscard; this will make the

netinst small enough to fit on 128 mb usb keychains again.

debian/changelog

@@ -136,8 +136,10 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
     Some of the bootloaders were alredy included via debootstrap, but as they
     are being removed from there, it's better to add them explicitly here.
   * Remove iso-codes from netinst, not used.
+  * Drop floppies from i386 netinst and businesscard; this will make the
+    netinst small enough to fit on 128 mb usb keychains again.
 
- -- Joey Hess <joeyh@debian.org>  Tue, 27 Dec 2005 00:36:24 -0500
+ -- Joey Hess <joeyh@debian.org>  Wed, 28 Dec 2005 13:07:04 -0500
 
 debian-cd (2.2.23) unstable; urgency=low
 

tools/boot/etch/boot-i386

@@ -50,14 +50,14 @@ KTYPE[10]=""
 THISTYPE=${KTYPE[$NN]}
 
 BOOT_IMAGES="cdrom/boot.img cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
-DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
-# Only include extra disk images on full CDs, not on smaller images.
+# Only include disk images on full CDs, not on smaller images.
 if [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ]; then
+	DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
 	EXTRA_DISK_IMAGES="floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img floppy/net-drivers.cfg"
 fi
 
 # Download boot images and floppies.
-for image in $BOOT_IMAGES $DISK_IMAGES; do
+for image in $BOOT_IMAGES; do
     if [ ! -e "$image" ]; then
 	dir=$(dirname $image)
 	mkdir -p $dir
@@ -75,7 +75,7 @@ for image in $BOOT_IMAGES $DISK_IMAGES; do
 done
 
 # Floppies that are not really required or may be unavailable.
-for image in $EXTRA_DISK_IMAGES; do
+for image in $DISK_IMAGES $EXTRA_DISK_IMAGES; do
     if [ ! -e "$image" ]; then
 	dir=$(dirname $image)
 	mkdir -p $dir