From 9639820deded13d53e221a19f45664b6da1666a1 Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@debian.org>
Date: Sun, 25 Apr 2004 16:25:11 +0000
Subject: [PATCH]     - discover has been renamed to discover1     - On i386,
 include discover on the CD as well, this is discover verson       2, and is
 used with the 2.6 kernel.

---
 debian/changelog              |  3 +++
 tasks/debian-installer+kernel | 11 ++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e8dee12..df790bd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
     - Remove module-init-tools-udeb from the CD.
     - Remove raidtools2-udeb from the exclude list, while nothing depends on
       it, it can be handy for manually setting up raid.
+    - discover has been renamed to discover1
+    - On i386, include discover on the CD as well, this is discover verson
+      2, and is used with the 2.6 kernel.
   * Petter Reinholdtsen
     - Regenereated tasks/popularity-contest-sarge based on the current data.
     - Avoid kernel versions 2.4.24 and 2.6.3 on the first i386 CD, as we
diff --git a/tasks/debian-installer+kernel b/tasks/debian-installer+kernel
index b53ca8ff..fb6ff6a9 100644
--- a/tasks/debian-installer+kernel
+++ b/tasks/debian-installer+kernel
@@ -25,13 +25,14 @@ xfsprogs
 reiserfsprogs
 #ifdef ARCH_i386
 discover
+discover1
 grub
 lilo
 kernel-image-2.4.25-1-386
 kernel-pcmcia-modules-2.4.25-1-386
 #endif
 #ifdef ARCH_alpha
-discover
+discover1
 kernel-image-2.4-generic
 kernel-image-2.4-smp
 kernel-image-2.4.25-1-generic
@@ -42,14 +43,14 @@ kernel-image-2.6.3-1-generic
 kernel-image-2.6.3-1-smp
 #endif
 #ifdef ARCH_hppa
-discover
+discover1
 kernel-image-2.4.25-32
 kernel-image-2.4.25-32-smp
 kernel-image-2.4.25-64
 kernel-image-2.4.25-64-smp
 #endif
 #ifdef ARCH_ia64
-discover
+discover1
 initrd-tools
 kernel-image-2.6.3-itanium
 kernel-image-2.6.3-itanium-smp
@@ -66,7 +67,7 @@ kernel-image-2.4.19-r3k-kn02
 kernel-image-2.4.19-r4k-kn04
 #endif
 #ifdef ARCH_powerpc
-discover
+discover1
 kernel-image-2.4.25-powerpc-pmac
 kernel-image-2.4.25-powerpc-small-pmac
 kernel-image-2.4.25-powerpc-prep
@@ -75,7 +76,7 @@ kernel-image-2.4.25-powerpc-chrp-rs6k
 kernel-image-2.4.25-apus
 #endif
 #ifdef ARCH_sparc
-discover
+discover1
 kernel-image-2.4.24-sparc32
 kernel-image-2.4.24-sparc32-smp
 kernel-image-2.4.24-sparc64