Re: switch to console-setup?
Here is the patch I propose to switch to console-setup.
It essentially boils down to
replacing console-keymaps-amiga with console-setup-amiga-ekmap
replacing console-keymaps-atari with console-setup-atari-ekmap
replacing console-keymaps-at and console-keymaps-usb with console-setup-pc-ekmap
replacing kbd-chooser with console-setup-udeb + kbd-udeb
And I've left acorn as a comment.
Samuel
diff --git a/build/pkg-lists/cdrom-apus/powerpc.cfg b/build/pkg-lists/cdrom-apus/powerpc.cfg
index 838b86f..adcf6d2 100644
--- a/build/pkg-lists/cdrom-apus/powerpc.cfg
+++ b/build/pkg-lists/cdrom-apus/powerpc.cfg
@@ -2,7 +2,7 @@ input-modules-${kernel:Version}
firewire-core-modules-${kernel:Version}
ide-modules-${kernel:Version}
scsi-modules-${kernel:Version}
-console-keymaps-amiga
-console-keymaps-at
-console-keymaps-usb
-kbd-chooser
+console-setup-amiga-ekmap
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
diff --git a/build/pkg-lists/cdrom/alpha.cfg b/build/pkg-lists/cdrom/alpha.cfg
index b9809fa..b391162 100644
--- a/build/pkg-lists/cdrom/alpha.cfg
+++ b/build/pkg-lists/cdrom/alpha.cfg
@@ -1,13 +1,14 @@
srm-reader
srm-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
cdrom-core-modules-${kernel:Version}
ide-modules-${kernel:Version}
ide-core-modules-${kernel:Version}
serial-modules-${kernel:Version} ?
usb-serial-modules-${kernel:Version} ?
uinput-modules-${kernel:Version} ?
-kbd-chooser
+console-setup-udeb
+kbd-udeb
scsi-core-modules-${kernel:Version}
# Support for SCSI cdroms on common controllers.
diff --git a/build/pkg-lists/cdrom/amd64.cfg b/build/pkg-lists/cdrom/amd64.cfg
index ffc492b..66f4817 100644
--- a/build/pkg-lists/cdrom/amd64.cfg
+++ b/build/pkg-lists/cdrom/amd64.cfg
@@ -1,4 +1,4 @@
-console-keymaps-at
+console-setup-pc-ekmap
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
@@ -6,7 +6,8 @@ ide-modules-${kernel:Version}
ide-core-modules-${kernel:Version}
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
usb-modules-${kernel:Version}
serial-modules-${kernel:Version}
usb-serial-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/cdrom/armel.cfg b/build/pkg-lists/cdrom/armel.cfg
index f1d760e..6d40154 100644
--- a/build/pkg-lists/cdrom/armel.cfg
+++ b/build/pkg-lists/cdrom/armel.cfg
@@ -1,6 +1,7 @@
-console-keymaps-acorn
-console-keymaps-at
-kbd-chooser
+#console-setup-pc-acorn
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
nic-modules-${kernel:Version} ?
nic-shared-modules-${kernel:Version} ?
cdrom-core-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/cdrom/hppa.cfg b/build/pkg-lists/cdrom/hppa.cfg
index 4cf3647..e0508b1 100644
--- a/build/pkg-lists/cdrom/hppa.cfg
+++ b/build/pkg-lists/cdrom/hppa.cfg
@@ -7,5 +7,6 @@ usb-modules-${kernel:Version}
usb-storage-modules-${kernel:Version}
cdebconf-text-udeb
-console-keymaps-at
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
diff --git a/build/pkg-lists/cdrom/i386.cfg b/build/pkg-lists/cdrom/i386.cfg
index 42551cd..3483caf 100644
--- a/build/pkg-lists/cdrom/i386.cfg
+++ b/build/pkg-lists/cdrom/i386.cfg
@@ -1,4 +1,4 @@
-console-keymaps-at
+console-setup-pc-ekmap
floppy-modules-${kernel:Version}
fat-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
@@ -6,7 +6,8 @@ ide-modules-${kernel:Version}
ide-core-modules-${kernel:Version}
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
usb-modules-${kernel:Version}
serial-modules-${kernel:Version}
usb-serial-modules-${kernel:Version} ?
diff --git a/build/pkg-lists/cdrom/ia64.cfg b/build/pkg-lists/cdrom/ia64.cfg
index 672ba26..bda421c 100644
--- a/build/pkg-lists/cdrom/ia64.cfg
+++ b/build/pkg-lists/cdrom/ia64.cfg
@@ -1,7 +1,8 @@
efi-reader
cdebconf-text-udeb
-console-keymaps-at
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
fat-modules-${kernel:Version}
ide-core-modules-${kernel:Version}
diff --git a/build/pkg-lists/cdrom/kfreebsd-amd64.cfg b/build/pkg-lists/cdrom/kfreebsd-amd64.cfg
index 06f5d30..2373132 100644
--- a/build/pkg-lists/cdrom/kfreebsd-amd64.cfg
+++ b/build/pkg-lists/cdrom/kfreebsd-amd64.cfg
@@ -19,7 +19,6 @@ isofs-modules-${kernel:Version}
# Keyboard and console
bogl-bterm-udeb -
console-setup-udeb
-kbd-chooser -
console-setup-pc-ekbd
console-setup-freebsd-charmaps-udeb
kbdcontrol-udeb
diff --git a/build/pkg-lists/cdrom/kfreebsd-i386.cfg b/build/pkg-lists/cdrom/kfreebsd-i386.cfg
index 06f5d30..2373132 100644
--- a/build/pkg-lists/cdrom/kfreebsd-i386.cfg
+++ b/build/pkg-lists/cdrom/kfreebsd-i386.cfg
@@ -19,7 +19,6 @@ isofs-modules-${kernel:Version}
# Keyboard and console
bogl-bterm-udeb -
console-setup-udeb
-kbd-chooser -
console-setup-pc-ekbd
console-setup-freebsd-charmaps-udeb
kbdcontrol-udeb
diff --git a/build/pkg-lists/cdrom/m68k.cfg b/build/pkg-lists/cdrom/m68k.cfg
index dc0fda5..c6ade82 100644
--- a/build/pkg-lists/cdrom/m68k.cfg
+++ b/build/pkg-lists/cdrom/m68k.cfg
@@ -2,8 +2,9 @@
cdrom-core-modules-${kernel:Version}
scsi-modules-${kernel:Version}
isofs-modules-${kernel:Version}
-console-keymaps-at
-console-keymaps-amiga
-console-keymaps-atari
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-amiga-ekmap
+console-setup-atari-ekmap
+console-setup-udeb
+kbd-udeb
archdetect
diff --git a/build/pkg-lists/cdrom/mips.cfg b/build/pkg-lists/cdrom/mips.cfg
index 3e118da..f7d3f95 100644
--- a/build/pkg-lists/cdrom/mips.cfg
+++ b/build/pkg-lists/cdrom/mips.cfg
@@ -1,2 +1,3 @@
-console-keymaps-at
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
diff --git a/build/pkg-lists/cdrom/mipsel.cfg b/build/pkg-lists/cdrom/mipsel.cfg
index 3c9cc6a..f7d3f95 100644
--- a/build/pkg-lists/cdrom/mipsel.cfg
+++ b/build/pkg-lists/cdrom/mipsel.cfg
@@ -1 +1,3 @@
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
diff --git a/build/pkg-lists/cdrom/powerpc.cfg b/build/pkg-lists/cdrom/powerpc.cfg
index f5a14f1..92a5de3 100644
--- a/build/pkg-lists/cdrom/powerpc.cfg
+++ b/build/pkg-lists/cdrom/powerpc.cfg
@@ -3,9 +3,9 @@ firewire-core-modules-${kernel:Version}
ide-modules-${kernel:Version}
pata-modules-${kernel:Version}
-console-keymaps-at
-console-keymaps-usb
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
# The following can be removed once unix socket support is compiled
# in to the kernel.
usb-modules-${kernel:Version}
diff --git a/build/pkg-lists/cdrom/sparc.cfg b/build/pkg-lists/cdrom/sparc.cfg
index 763cf12..12d3536 100644
--- a/build/pkg-lists/cdrom/sparc.cfg
+++ b/build/pkg-lists/cdrom/sparc.cfg
@@ -2,7 +2,8 @@ nic-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
sparc-utils-udeb
-kbd-chooser
+console-setup-udeb
+kbd-udeb
input-modules-${kernel:Version}
ide-modules-${kernel:Version}
@@ -12,4 +13,4 @@ usb-storage-modules-${kernel:Version}
scsi-common-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
diff --git a/build/pkg-lists/cdrom/sparc64.cfg b/build/pkg-lists/cdrom/sparc64.cfg
index 763cf12..12d3536 100644
--- a/build/pkg-lists/cdrom/sparc64.cfg
+++ b/build/pkg-lists/cdrom/sparc64.cfg
@@ -2,7 +2,8 @@ nic-modules-${kernel:Version}
cdrom-core-modules-${kernel:Version}
sparc-utils-udeb
-kbd-chooser
+console-setup-udeb
+kbd-udeb
input-modules-${kernel:Version}
ide-modules-${kernel:Version}
@@ -12,4 +13,4 @@ usb-storage-modules-${kernel:Version}
scsi-common-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
diff --git a/build/pkg-lists/floppy/common b/build/pkg-lists/floppy/common
index 285da0e..cfc0197 100644
--- a/build/pkg-lists/floppy/common
+++ b/build/pkg-lists/floppy/common
@@ -14,7 +14,8 @@
localechooser
bogl-bterm-udeb
di-utils-terminfo
-kbd-chooser
+console-setup-udeb
+kbd-udeb
cdebconf-newt-udeb
installation-locale
diff --git a/build/pkg-lists/floppy/m68k.cfg b/build/pkg-lists/floppy/m68k.cfg
index dcd6b93..178c459 100644
--- a/build/pkg-lists/floppy/m68k.cfg
+++ b/build/pkg-lists/floppy/m68k.cfg
@@ -1,4 +1,4 @@
-console-keymaps-at
+console-setup-pc-ekmap
# net installation support
net-retriever
diff --git a/build/pkg-lists/floppy/powerpc.cfg b/build/pkg-lists/floppy/powerpc.cfg
index 5fe9b66..8ef8beb 100644
--- a/build/pkg-lists/floppy/powerpc.cfg
+++ b/build/pkg-lists/floppy/powerpc.cfg
@@ -1,2 +1 @@
-console-keymaps-at
-console-keymaps-usb
+console-setup-pc-ekmap
diff --git a/build/pkg-lists/gtk-common b/build/pkg-lists/gtk-common
index 37ac8b3..65f6a3d 100644
--- a/build/pkg-lists/gtk-common
+++ b/build/pkg-lists/gtk-common
@@ -7,11 +7,6 @@ cdebconf-gtk-terminal
xserver-xorg-core-udeb
gtk2-engines-udeb
-# Use console-setup instead of kbd-chooser
-console-setup-udeb
-kbd-chooser -
-console-keymaps-at -
-
# Fonts: see http://wiki.debian.org/DebianInstaller/GUIFonts
ttf-freefont-udeb
fonts-farsiweb-udeb
diff --git a/build/pkg-lists/hd-media/amd64.cfg b/build/pkg-lists/hd-media/amd64.cfg
index c90d031..d475846 100644
--- a/build/pkg-lists/hd-media/amd64.cfg
+++ b/build/pkg-lists/hd-media/amd64.cfg
@@ -1,7 +1,8 @@
-console-keymaps-at
+console-setup-pc-ekmap
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
# full support for all types of hard drives, and usb devices
ide-core-modules-${kernel:Version}
diff --git a/build/pkg-lists/hd-media/i386.cfg b/build/pkg-lists/hd-media/i386.cfg
index c90d031..d475846 100644
--- a/build/pkg-lists/hd-media/i386.cfg
+++ b/build/pkg-lists/hd-media/i386.cfg
@@ -1,7 +1,8 @@
-console-keymaps-at
+console-setup-pc-ekmap
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
# full support for all types of hard drives, and usb devices
ide-core-modules-${kernel:Version}
diff --git a/build/pkg-lists/hd-media/m68k.cfg b/build/pkg-lists/hd-media/m68k.cfg
index 3868ee8..01d9b5e 100644
--- a/build/pkg-lists/hd-media/m68k.cfg
+++ b/build/pkg-lists/hd-media/m68k.cfg
@@ -1,7 +1,8 @@
#ide-modules-${kernel:Version}
#scsi-modules-${kernel:Version}
-console-keymaps-at
-console-keymaps-amiga
-console-keymaps-atari
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-amiga-ekmap
+console-setup-atari-ekmap
+console-setup-udeb
+kbd-udeb
archdetect
diff --git a/build/pkg-lists/hd-media/powerpc.cfg b/build/pkg-lists/hd-media/powerpc.cfg
index 1fba486..cae884d 100644
--- a/build/pkg-lists/hd-media/powerpc.cfg
+++ b/build/pkg-lists/hd-media/powerpc.cfg
@@ -1,8 +1,8 @@
-console-keymaps-at
-console-keymaps-usb
+console-setup-pc-ekmap
input-modules-${kernel:Version}
#fb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
# full support for all types of hard drives, and usb devices
ide-modules-${kernel:Version}
diff --git a/build/pkg-lists/monolithic/amd64.cfg b/build/pkg-lists/monolithic/amd64.cfg
index 3011a58..c6c07b3 100644
--- a/build/pkg-lists/monolithic/amd64.cfg
+++ b/build/pkg-lists/monolithic/amd64.cfg
@@ -1,6 +1,7 @@
-console-keymaps-at
+console-setup-pc-ekmap
bogl-bterm-udeb
-kbd-chooser
+console-setup-udeb
+kbd-udeb
pcmciautils-udeb
acpi-modules-${kernel:Version}
diff --git a/build/pkg-lists/monolithic/i386.cfg b/build/pkg-lists/monolithic/i386.cfg
index 3011a58..c6c07b3 100644
--- a/build/pkg-lists/monolithic/i386.cfg
+++ b/build/pkg-lists/monolithic/i386.cfg
@@ -1,6 +1,7 @@
-console-keymaps-at
+console-setup-pc-ekmap
bogl-bterm-udeb
-kbd-chooser
+console-setup-udeb
+kbd-udeb
pcmciautils-udeb
acpi-modules-${kernel:Version}
diff --git a/build/pkg-lists/monolithic/mipsel.cfg b/build/pkg-lists/monolithic/mipsel.cfg
index 434e2c1..5e28f10 100644
--- a/build/pkg-lists/monolithic/mipsel.cfg
+++ b/build/pkg-lists/monolithic/mipsel.cfg
@@ -1,6 +1,7 @@
-console-keymaps-at
+console-setup-pc-ekmap
bogl-bterm-udeb
-kbd-chooser
+console-setup-udeb
+kbd-udeb
pcmciautils-udeb
# These are broken and/or irrelevant
diff --git a/build/pkg-lists/monolithic/powerpc.cfg b/build/pkg-lists/monolithic/powerpc.cfg
index 311b630..33a8eea 100644
--- a/build/pkg-lists/monolithic/powerpc.cfg
+++ b/build/pkg-lists/monolithic/powerpc.cfg
@@ -1,7 +1,7 @@
-console-keymaps-at
-console-keymaps-usb
+console-setup-pc-ekmap
bogl-bterm-udeb
-kbd-chooser
+console-setup-udeb
+kbd-udeb
pcmciautils-udeb
eject-udeb
# Used by yaboot-installer
diff --git a/build/pkg-lists/nativehd/m68k.cfg b/build/pkg-lists/nativehd/m68k.cfg
index 3f7d66e..7037ffb 100644
--- a/build/pkg-lists/nativehd/m68k.cfg
+++ b/build/pkg-lists/nativehd/m68k.cfg
@@ -1,7 +1,8 @@
-console-keymaps-at
-console-keymaps-amiga
-console-keymaps-atari
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-amiga-ekmap
+console-setup-atari-ekmap
+console-setup-udeb
+kbd-udeb
nic-shared-modules-${kernel:Version}
file-preseed
network-preseed
diff --git a/build/pkg-lists/netboot-apus/powerpc.cfg b/build/pkg-lists/netboot-apus/powerpc.cfg
index c96053c..3adcb5a 100644
--- a/build/pkg-lists/netboot-apus/powerpc.cfg
+++ b/build/pkg-lists/netboot-apus/powerpc.cfg
@@ -1,9 +1,10 @@
input-modules-${kernel:Version}
-console-keymaps-amiga
+console-setup-amiga-ekmap
nic-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/build/pkg-lists/netboot/alpha.cfg b/build/pkg-lists/netboot/alpha.cfg
index 985d549..b5d9c6c 100644
--- a/build/pkg-lists/netboot/alpha.cfg
+++ b/build/pkg-lists/netboot/alpha.cfg
@@ -4,9 +4,10 @@ nic-shared-modules-${kernel:Version}
nic-modules-${kernel:Version}
nic-extra-modules-${kernel:Version}
nic-wireless-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/build/pkg-lists/netboot/amd64.cfg b/build/pkg-lists/netboot/amd64.cfg
index 50ea757..ec6beef 100644
--- a/build/pkg-lists/netboot/amd64.cfg
+++ b/build/pkg-lists/netboot/amd64.cfg
@@ -1,4 +1,4 @@
-console-keymaps-at
+console-setup-pc-ekmap
bogl-bterm-udeb
@@ -9,7 +9,8 @@ nic-wireless-modules-${kernel:Version}
virtio-modules-${kernel:Version}
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
diff --git a/build/pkg-lists/netboot/armel.cfg b/build/pkg-lists/netboot/armel.cfg
index 89bfa51..26be351 100644
--- a/build/pkg-lists/netboot/armel.cfg
+++ b/build/pkg-lists/netboot/armel.cfg
@@ -1,6 +1,7 @@
-console-keymaps-at
+console-setup-pc-ekmap
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/build/pkg-lists/netboot/armhf.cfg b/build/pkg-lists/netboot/armhf.cfg
index 4830a4c..e8a2b96 100644
--- a/build/pkg-lists/netboot/armhf.cfg
+++ b/build/pkg-lists/netboot/armhf.cfg
@@ -1,6 +1,7 @@
-console-keymaps-at
+console-setup-pc-ekmap
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/build/pkg-lists/netboot/hppa.cfg b/build/pkg-lists/netboot/hppa.cfg
index f9341de..6942dcb 100644
--- a/build/pkg-lists/netboot/hppa.cfg
+++ b/build/pkg-lists/netboot/hppa.cfg
@@ -1,9 +1,10 @@
input-modules-${kernel:Version}
nic-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/build/pkg-lists/netboot/i386.cfg b/build/pkg-lists/netboot/i386.cfg
index 65ddfe9..3340b1d 100644
--- a/build/pkg-lists/netboot/i386.cfg
+++ b/build/pkg-lists/netboot/i386.cfg
@@ -1,4 +1,4 @@
-console-keymaps-at
+console-setup-pc-ekmap
bogl-bterm-udeb
@@ -9,7 +9,8 @@ nic-wireless-modules-${kernel:Version}
virtio-modules-${kernel:Version}
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
diff --git a/build/pkg-lists/netboot/ia64.cfg b/build/pkg-lists/netboot/ia64.cfg
index 7ad79ea..08e292b 100644
--- a/build/pkg-lists/netboot/ia64.cfg
+++ b/build/pkg-lists/netboot/ia64.cfg
@@ -1,11 +1,12 @@
nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
efi-reader
-console-keymaps-at
+console-setup-pc-ekmap
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/build/pkg-lists/netboot/kfreebsd-amd64.cfg b/build/pkg-lists/netboot/kfreebsd-amd64.cfg
index 97f997d..4af0926 100644
--- a/build/pkg-lists/netboot/kfreebsd-amd64.cfg
+++ b/build/pkg-lists/netboot/kfreebsd-amd64.cfg
@@ -21,7 +21,6 @@ netcfg
# Keyboard and console
bogl-bterm-udeb -
console-setup-udeb
-kbd-chooser -
console-setup-pc-ekbd
console-setup-freebsd-charmaps-udeb
kbdcontrol-udeb
diff --git a/build/pkg-lists/netboot/kfreebsd-i386.cfg b/build/pkg-lists/netboot/kfreebsd-i386.cfg
index 97f997d..4af0926 100644
--- a/build/pkg-lists/netboot/kfreebsd-i386.cfg
+++ b/build/pkg-lists/netboot/kfreebsd-i386.cfg
@@ -21,7 +21,6 @@ netcfg
# Keyboard and console
bogl-bterm-udeb -
console-setup-udeb
-kbd-chooser -
console-setup-pc-ekbd
console-setup-freebsd-charmaps-udeb
kbdcontrol-udeb
diff --git a/build/pkg-lists/netboot/m68k.cfg b/build/pkg-lists/netboot/m68k.cfg
index eaad84e..21969be 100644
--- a/build/pkg-lists/netboot/m68k.cfg
+++ b/build/pkg-lists/netboot/m68k.cfg
@@ -1,5 +1,6 @@
-console-keymaps-at
-kbd-chooser
+console-setup-pc-ekmap
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/build/pkg-lists/netboot/mips.cfg b/build/pkg-lists/netboot/mips.cfg
index 1f675dd..59965b2 100644
--- a/build/pkg-lists/netboot/mips.cfg
+++ b/build/pkg-lists/netboot/mips.cfg
@@ -1,6 +1,7 @@
-console-keymaps-at
+console-setup-udeb
+kbd-udeb
-kbd-chooser
+console-setup-pc-ekmap
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/build/pkg-lists/netboot/mips/sb1-bcm91250a.cfg b/build/pkg-lists/netboot/mips/sb1-bcm91250a.cfg
index c6c005d..8bca179 100644
--- a/build/pkg-lists/netboot/mips/sb1-bcm91250a.cfg
+++ b/build/pkg-lists/netboot/mips/sb1-bcm91250a.cfg
@@ -1,4 +1,4 @@
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-console-keymaps-usb
+console-setup-pc-ekmap
diff --git a/build/pkg-lists/netboot/mipsel.cfg b/build/pkg-lists/netboot/mipsel.cfg
index 0d138c9..7516463 100644
--- a/build/pkg-lists/netboot/mipsel.cfg
+++ b/build/pkg-lists/netboot/mipsel.cfg
@@ -1,7 +1,8 @@
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
netcfg
-console-keymaps-at
+console-setup-pc-ekmap
diff --git a/build/pkg-lists/netboot/mipsel/sb1-bcm91250a.cfg b/build/pkg-lists/netboot/mipsel/sb1-bcm91250a.cfg
index c6c005d..8bca179 100644
--- a/build/pkg-lists/netboot/mipsel/sb1-bcm91250a.cfg
+++ b/build/pkg-lists/netboot/mipsel/sb1-bcm91250a.cfg
@@ -1,4 +1,4 @@
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
fb-modules-${kernel:Version}
-console-keymaps-usb
+console-setup-pc-ekmap
diff --git a/build/pkg-lists/netboot/network-console/common b/build/pkg-lists/netboot/network-console/common
index 5a98cf5..1f6b749 100644
--- a/build/pkg-lists/netboot/network-console/common
+++ b/build/pkg-lists/netboot/network-console/common
@@ -3,7 +3,8 @@
# Remove localechooser so it will be pulled in via the network once the
# user has logged in via SSH and can actually respond to questions.
localechooser -
-# Also remove kbd-chooser as it's not relevant for this type of install
+# Also remove console-setup as it's not relevant for this type of install
# (and the devices for which it's used).
-kbd-chooser -
-console-keymaps-at -
+console-setup-udeb -
+kbd-udeb -
+console-setup-pc-ekmap -
diff --git a/build/pkg-lists/netboot/powerpc.cfg b/build/pkg-lists/netboot/powerpc.cfg
index ac68fcc..a5b72cb 100644
--- a/build/pkg-lists/netboot/powerpc.cfg
+++ b/build/pkg-lists/netboot/powerpc.cfg
@@ -1,6 +1,5 @@
input-modules-${kernel:Version}
-console-keymaps-at
-console-keymaps-usb
+console-setup-pc-ekmap
nic-modules-${kernel:Version}
nic-extra-modules-${kernel:Version}
nic-pcmcia-modules-${kernel:Version}
@@ -13,7 +12,8 @@ floppy-modules-${kernel:Version}
#fb-modules-${kernel:Version}
usb-modules-${kernel:Version}
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/build/pkg-lists/netboot/sh4.cfg b/build/pkg-lists/netboot/sh4.cfg
index af3a7bc..b9417d3 100644
--- a/build/pkg-lists/netboot/sh4.cfg
+++ b/build/pkg-lists/netboot/sh4.cfg
@@ -5,10 +5,11 @@ nic-modules-${kernel:Version}
nic-usb-modules-${kernel:Version}
bogl-bterm-udeb
-console-keymaps-usb
+console-setup-pc-ekmap
ethdetect
hw-detect
-kbd-chooser
+console-setup-udeb
+kbd-udeb
netcfg
# In case they need to load a driver image.
diff --git a/build/pkg-lists/netboot/sparc.cfg b/build/pkg-lists/netboot/sparc.cfg
index 7bf0f58..9be11be 100644
--- a/build/pkg-lists/netboot/sparc.cfg
+++ b/build/pkg-lists/netboot/sparc.cfg
@@ -1,4 +1,5 @@
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
@@ -15,4 +16,4 @@ media-retriever
usb-storage-modules-${kernel:Version}
fat-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
diff --git a/build/pkg-lists/netboot/sparc64.cfg b/build/pkg-lists/netboot/sparc64.cfg
index 7bf0f58..9be11be 100644
--- a/build/pkg-lists/netboot/sparc64.cfg
+++ b/build/pkg-lists/netboot/sparc64.cfg
@@ -1,4 +1,5 @@
-kbd-chooser
+console-setup-udeb
+kbd-udeb
bogl-bterm-udeb
hw-detect
ethdetect
@@ -15,4 +16,4 @@ media-retriever
usb-storage-modules-${kernel:Version}
fat-modules-${kernel:Version}
-console-keymaps-at
+console-setup-pc-ekmap
Reply to: