Don't download floppy D-I images for i386; they're no longer available

This commit is contained in:
Frans Pop 2009-08-04 20:34:23 +00:00
parent ed19bfa438
commit 83fcacb0f7
3 changed files with 4 additions and 3 deletions

3
debian/changelog vendored
View File

@ -9,8 +9,9 @@ debian-cd (3.1.3) UNRELEASED; urgency=low
* sparc: display message for unsupported subarchitectures.
* Only do boot disk stuff for x86 and alpha if the image is supposed to be
bootable. Avoids downloading x86 D-I images for all 30+ CDs in a full set.
* Don't download floppy D-I images for i386; they're no longer available.
-- Frans Pop <fjp@debian.org> Tue, 04 Aug 2009 21:50:26 +0200
-- Frans Pop <fjp@debian.org> Tue, 04 Aug 2009 22:32:08 +0200
debian-cd (3.1.2) unstable; urgency=low

View File

@ -71,7 +71,7 @@ fi
BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
# Only include disk images on full CDs, not on smaller images.
if [ "$ARCH" = i386 ] && [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ]; then
DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
#DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
#EXTRA_DISK_IMAGES="cdrom/boot.img"
fi

View File

@ -71,7 +71,7 @@ fi
BOOT_IMAGES="cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
# Only include disk images on full CDs, not on smaller images.
if [ "$ARCH" = i386 ] && [ "$INSTALLER_CD" != 1 ] && [ "$INSTALLER_CD" != 2 ]; then
DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
#DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
#EXTRA_DISK_IMAGES="cdrom/boot.img"
fi