- Add new default udeb_include files (for to full CDs and DVDs) that

include ethdetect and netcfg, to make network configuration happen in
      first stage, since the second stage cannot currently do any.

Makefile

@@ -71,7 +71,7 @@ JIGDOSCRIPT=$(BASEDIR)/tools/jigdo_header
 endif
 
 ifndef UDEB_INCLUDE
-# Netinst/businesscard CD should have udeb_include file by default
+# Netinst/businesscard CD have different udeb_include files
 ifeq ($(INSTALLER_CD),1)
 UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_businesscard_udeb_include
 endif
@@ -79,6 +79,11 @@ ifeq ($(INSTALLER_CD),2)
 UDEB_INCLUDE=$(BASEDIR)/data/$(DI_CODENAME)/$(ARCH)_netinst_udeb_include
 endif
 endif
+# Default udeb_include files.
+ifndef UDEB_INCLUDE
+UDEB_INCLUDE=$(BASEDIR)/data/$(CODENAME)/$(ARCH)_udeb_include
+endif
+
 
 ## Internal variables  
 apt=$(BASEDIR)/tools/apt-selection

data/sarge/alpha_udeb_include

@@ -0,0 +1,3 @@
+netcfg
+ethdetect
+fdisk-udeb

data/sarge/arm_udeb_include

@@ -0,0 +1,2 @@
+netcfg
+ethdetect

data/sarge/hppa_udeb_include

@@ -0,0 +1,2 @@
+netcfg
+ethdetect

data/sarge/i386_udeb_include

@@ -0,0 +1,4 @@
+netcfg
+ethdetect
+pcmcia-cs-udeb
+wireless-tools-udeb

data/sarge/ia64_udeb_include

@@ -0,0 +1,2 @@
+netcfg
+ethdetect

data/sarge/m68k_udeb_include

@@ -0,0 +1,2 @@
+netcfg
+ethdetect

data/sarge/mips_udeb_include

@@ -0,0 +1,2 @@
+netcfg
+ethdetect

data/sarge/mipsel_udeb_include

@@ -0,0 +1,2 @@
+netcfg
+ethdetect

data/sarge/s390_udeb_include

@@ -0,0 +1,2 @@
+netcfg
+ethdetect

data/sarge/sparc_udeb_include

@@ -0,0 +1,2 @@
+netcfg
+ethdetect

debian/changelog

@@ -37,6 +37,9 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
     - Only exclude udebs from the CD that are in both the cd initrd and the
       hd-media initrd, since both use the CD. This adds back floppy-modules
       and firewire-core-modules.
+    - Add new default udeb_include files (for to full CDs and DVDs) that
+      include ethdetect and netcfg, to make network configuration happen in
+      first stage, since the second stage cannot currently do any.
   * 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