From b5336e8ec2eed4c44d24370c9e364c267f95fb40 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sat, 1 Jul 2006 23:12:59 +0000 Subject: [PATCH] * Add 686 kernels, since the netinst CD is much larger and can now easily fit them and this makes the CD much more attractive for many users. --- debian/changelog | 6 +++++- tools/generate_di+k_list | 8 ++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 3f80a6d5..f9769958 100644 --- a/debian/changelog +++ b/debian/changelog @@ -71,7 +71,11 @@ debian-cd (2.2.25) UNRELEASED; urgency=low [ Frans Pop ] * Wouter Verhelst has taken over daily d-i builds for powerpc. - -- Frans Pop Fri, 23 Jun 2006 22:49:03 +0200 + [ Joey Hess ] + * Add 686 kernels, since the netinst CD is much larger and can now easily + fit them and this makes the CD much more attractive for many users. + + -- Joey Hess Sat, 1 Jul 2006 19:11:19 -0400 debian-cd (2.2.24) unstable; urgency=low diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list index 96de6c53..1866bbe7 100755 --- a/tools/generate_di+k_list +++ b/tools/generate_di+k_list @@ -77,17 +77,17 @@ discover1 grub lilo /* Note that we do not have to include every optimised kernel flavor for - * i386. Kernel headers are included as third party modules are commonly + * i386, but this does control what kernels are available on the netinst CD. + * Kernel headers are included as third party modules are commonly * used on this architecture. */ kernel-image-2.4-386 kernel-pcmcia-modules-2.4-386 kernel-headers-2.4-386 -linux-image-2.6-386 -linux-headers-2.6-386 -/* 486 are same images, new name */ linux-image-2.6-486 linux-headers-2.6-486 +linux-image-2.6-686 +linux-headers-2.6-686 #endif #ifdef ARCH_amd64