- Remove console-keymaps from all udeb_includes; they are included

on the cdrom initrds.
    - Switch from netcfg-static/dhcp to just netcfg.
    - Split udeb_includes for businesscard and netinst; netinst does not
      need choose-mirror, while businesscard does.

Makefile

@@ -73,7 +73,7 @@ endif
 ifndef UDEB_INCLUDE
 # Netinst/businesscard CD should have udeb_include file by default
 ifeq ($(INSTALLER_CD),1)
-UDEB_INCLUDE=$(BASEDIR)/data/$(CODENAME)/$(ARCH)_netinst_udeb_include
+UDEB_INCLUDE=$(BASEDIR)/data/$(CODENAME)/$(ARCH)_businesscard_udeb_include
 endif
 ifeq ($(INSTALLER_CD),2)
 UDEB_INCLUDE=$(BASEDIR)/data/$(CODENAME)/$(ARCH)_netinst_udeb_include

data/sarge/alpha_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/alpha_netinst_udeb_include

@@ -1,6 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect
-console-keymaps-ps2
-console-keymaps-usb

data/sarge/arm_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/arm_netinst_udeb_include

@@ -1,7 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect
-console-keymaps-acorn
-console-keymaps-ps2
-console-keymaps-usb

data/sarge/hppa_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/hppa_netinst_udeb_include

@@ -1,4 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect

data/sarge/i386_businesscard_udeb_include

@@ -0,0 +1,4 @@
+choose-mirror
+netcfg
+ethdetect
+pcmcia-cs-udeb

data/sarge/i386_netinst_udeb_include

@@ -1,5 +1,3 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect
 pcmcia-cs-udeb

data/sarge/ia64_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/ia64_netinst_udeb_include

@@ -1,4 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect

data/sarge/m68k_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/m68k_netinst_udeb_include

@@ -1,8 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect
-pump-udeb
-console-keymaps-atari
-console-keymaps-amiga
-console-keymaps-mac

data/sarge/mips_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/mips_netinst_udeb_include

@@ -1,4 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect

data/sarge/mipsel_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/mipsel_netinst_udeb_include

@@ -1,4 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect

data/sarge/powerpc_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/powerpc_netinst_udeb_include

@@ -1,4 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect

data/sarge/s390_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/s390_netinst_udeb_include

@@ -1,4 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect

data/sarge/sparc_businesscard_udeb_include

@@ -0,0 +1,3 @@
+choose-mirror
+netcfg
+ethdetect

data/sarge/sparc_netinst_udeb_include

@@ -1,4 +1,2 @@
-choose-mirror
-netcfg-dhcp
-netcfg-static
+netcfg
 ethdetect

debian/changelog

@@ -15,8 +15,6 @@ debian-cd (2.2.17) UNRELEASED; urgency=low
     - Add "expert" mode to isolinux.cfg for sarge.
     - Remove pump-udeb from all udeb_includes; netcfg depends on and
       uses dhcp-client-udeb.
-    - Remove console-keymaps from all udeb_includes; they are included
-      on the cdrom initrds.
     - Add appropriate kernel-pcmcia-modules package to
       debian-installer+kernel task for i386.
     - Update the yaboot boot.msg to match the one in d-i cvs, including
@@ -28,6 +26,11 @@ debian-cd (2.2.17) UNRELEASED; urgency=low
     - Use the d-i docs in sid instead of the woody boot floppies docs.
     - Add pcmcia-cs-udeb to sarge's i386_netinst_udeb_include, to support
       pcmcia installs.
+    - Remove console-keymaps from all udeb_includes; they are included
+      on the cdrom initrds.
+    - Switch from netcfg-static/dhcp to just netcfg.
+    - Split udeb_includes for businesscard and netinst; netinst does not
+      need choose-mirror, while businesscard does.
 
  -- Raphael Hertzog <hertzog@debian.org>  Wed, 20 Aug 2003 20:17:06 +0200