10 files changed, 7 insertions, 15 deletions
diff --git a/data/debian-cd/lenny/amd64_businesscard_udeb_include b/data/debian-cd/lenny/amd64_businesscard_udeb_include
index bfc81f030..0089df09a 100644
--- a/data/debian-cd/lenny/amd64_businesscard_udeb_include
+++ b/data/debian-cd/lenny/amd64_businesscard_udeb_include
@@ -2,4 +2,3 @@ choose-mirror
 netcfg
 ethdetect
 pcmciautils-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/lenny/amd64_netinst_udeb_include b/data/debian-cd/lenny/amd64_netinst_udeb_include
index e5ed87395..155327762 100644
--- a/data/debian-cd/lenny/amd64_netinst_udeb_include
+++ b/data/debian-cd/lenny/amd64_netinst_udeb_include
@@ -1,4 +1,3 @@
 netcfg
 ethdetect
 pcmciautils-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/lenny/amd64_udeb_include b/data/debian-cd/lenny/amd64_udeb_include
index e5ed87395..155327762 100644
--- a/data/debian-cd/lenny/amd64_udeb_include
+++ b/data/debian-cd/lenny/amd64_udeb_include
@@ -1,4 +1,3 @@
 netcfg
 ethdetect
 pcmciautils-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/lenny/exclude-udebs b/data/debian-cd/lenny/exclude-udebs
index cbf0f216a..e169d9da9 100644
--- a/data/debian-cd/lenny/exclude-udebs
+++ b/data/debian-cd/lenny/exclude-udebs
@@ -45,8 +45,7 @@ cdebconf-gtk-udeb
 fontconfig-udeb
 libatk1.0-udeb
 libcairo-directfb2-udeb
-libdirectfb-0.9-22-udeb
-libdirectfb-0.9-25-udeb
+libdirectfb-*-udeb
 libexpat1-udeb
 libfreetype6-udeb
 libglib2.0-udeb
@@ -64,9 +63,9 @@ dash-udeb
 cdebootstrap-udeb
 hdparm-udeb
 laptop-detect-udeb
-# These dhcp clients are not the currently preferred one.
-# Exclusion disabled during switchover from DHCP v2 to v3.
-#dhcp3-client-udeb
+multipath-udeb
+libaio1-udeb
+dhcp-client-udeb
 # This package is only useful in the d-i-demo.
 di-utils-exit-installer
 # No need for these loaders.
@@ -122,4 +121,6 @@ discover1-data-udeb
 libdiscover1-udeb
 # Eh?
 gnumach-udeb
-# Exclude apt-setup components; they will be included 
+# Exclude kbd and console-setup udebs, they're not currently used
+kbd-udeb
+console-setup-*-udeb
diff --git a/data/debian-cd/lenny/i386_businesscard_udeb_include b/data/debian-cd/lenny/i386_businesscard_udeb_include
index bfc81f030..0089df09a 100644
--- a/data/debian-cd/lenny/i386_businesscard_udeb_include
+++ b/data/debian-cd/lenny/i386_businesscard_udeb_include
@@ -2,4 +2,3 @@ choose-mirror
 netcfg
 ethdetect
 pcmciautils-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/lenny/i386_netinst_udeb_include b/data/debian-cd/lenny/i386_netinst_udeb_include
index e5ed87395..155327762 100644
--- a/data/debian-cd/lenny/i386_netinst_udeb_include
+++ b/data/debian-cd/lenny/i386_netinst_udeb_include
@@ -1,4 +1,3 @@
 netcfg
 ethdetect
 pcmciautils-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/lenny/i386_udeb_include b/data/debian-cd/lenny/i386_udeb_include
index e5ed87395..155327762 100644
--- a/data/debian-cd/lenny/i386_udeb_include
+++ b/data/debian-cd/lenny/i386_udeb_include
@@ -1,4 +1,3 @@
 netcfg
 ethdetect
 pcmciautils-udeb
-wireless-tools-udeb
diff --git a/data/debian-cd/lenny/powerpc_businesscard_udeb_include b/data/debian-cd/lenny/powerpc_businesscard_udeb_include
index b5c5e7ea2..6326d6c5b 100644
--- a/data/debian-cd/lenny/powerpc_businesscard_udeb_include
+++ b/data/debian-cd/lenny/powerpc_businesscard_udeb_include
@@ -1,4 +1,3 @@
 choose-mirror
 netcfg
 ethdetect
-wireless-tools-udeb
diff --git a/data/debian-cd/lenny/powerpc_netinst_udeb_include b/data/debian-cd/lenny/powerpc_netinst_udeb_include
index 4a83dd2ab..6f1c801c0 100644
--- a/data/debian-cd/lenny/powerpc_netinst_udeb_include
+++ b/data/debian-cd/lenny/powerpc_netinst_udeb_include
@@ -1,3 +1,2 @@
 netcfg
 ethdetect
-wireless-tools-udeb
diff --git a/data/debian-cd/lenny/powerpc_udeb_include b/data/debian-cd/lenny/powerpc_udeb_include
index e5ed87395..155327762 100644
--- a/data/debian-cd/lenny/powerpc_udeb_include
+++ b/data/debian-cd/lenny/powerpc_udeb_include
@@ -1,4 +1,3 @@
 netcfg
 ethdetect
 pcmciautils-udeb
-wireless-tools-udeb