From d986cd11347fb29a829377e9fb123147a43616b3 Mon Sep 17 00:00:00 2001
From: Sven Luther <luther@debian.org>
Date: Sun, 18 Jul 2004 21:18:02 +0000
Subject: [PATCH] Finalized powerpc kernels fix.

---
 debian/changelog         | 3 +++
 tools/generate_di+k_list | 6 +++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 1b46850f..f539022c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 debian-cd (2.2.18) UNRELEASED; urgency=low
 
+  * Sven Luther
+    - fixed powerpc list so it includes the 2.6 kernels too as well as the
+      power3 and power4 2.4 kernels.
   * Remove debian-keyring.tar.gz from the doc dir.
   * Don't include Contents-$ARCH.gz on netinst/businesscard CD.
   * Raphael Hertzog
diff --git a/tools/generate_di+k_list b/tools/generate_di+k_list
index bdc4ef50..6470f688 100755
--- a/tools/generate_di+k_list
+++ b/tools/generate_di+k_list
@@ -121,10 +121,14 @@ cat >> debian-installer+kernel << EOF
 #ifdef ARCH_powerpc
 discover1
 yaboot
+mkvmlinuz
+module-init-tools
+initrd-tools
 EOF
 
 # Only include powerpc kernels that d-i base-installer installs.
-for subarch in powerpc power3 power4 powerpc-pmac powerpc-small-pmac \
+for subarch in powerpc power3 power4 power3-pmac power3-chrp-rs6k \
+		power4-pmac power4-chrp-rs6k powerpc-pmac powerpc-small-pmac \
 		powerpc-prep powerpc-chrp powerpc-chrp-rs6k apus; do
 	sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
 		$MIRROR/dists/$CODENAME/main/binary-powerpc/Packages \