Bug#568292: auto-install: pulls netcfg into images that should not have it
On Wednesday 03 February 2010, Frans Pop wrote:
> On Wednesday 03 February 2010, Frans Pop wrote:
> > On Wednesday 03 February 2010, Frans Pop wrote:
> > > Or if the dependency is required for menu ordering, then there
> > > should be an alternative udeb whose only function is to queue
> > > auto-install for images that don't have netcfg.
> >
> > Hmmm. I think it could even pull in both auto-install and ai-choosers
> > and thus leave ai-choosers out of the images as well.
>
> Gah! It's even worse. ai-chooser just blindly assumes that all images
> include both localechooser and kbd-chooser while that is not guaranteed.
Here's a final patch set that should address the current deficiencies (and
allows for console-setup too).
Phil: any comments?
From 9fb05b837a5a78ae4743c241e087df4568fb571c Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Wed, 3 Feb 2010 18:37:41 +0100
Subject: [PATCH 1/3] Add auto-install-nonet udeb
Intended to be included in images that don't include netcfg.
The udeb will queue auto-install for installation during anna if
auto-install/enable is true.
---
.../S60auto-install-nonet | 5 +++++
.../auto-install/debian/auto-install-nonet.install | 1 +
packages/auto-install/debian/control | 8 ++++++++
3 files changed, 14 insertions(+), 0 deletions(-)
create mode 100755 packages/auto-install/debian-installer-startup.d/S60auto-install-nonet
create mode 100644 packages/auto-install/debian/auto-install-nonet.install
diff --git a/packages/auto-install/debian-installer-startup.d/S60auto-install-nonet b/packages/auto-install/debian-installer-startup.d/S60auto-install-nonet
new file mode 100755
index 0000000..3545f2a
--- /dev/null
+++ b/packages/auto-install/debian-installer-startup.d/S60auto-install-nonet
@@ -0,0 +1,5 @@
+#! /bin/sh
+. /usr/share/debconf/confmodule
+if db_get auto-install/enable && [ "$RET" = true ]; then
+ anna-install auto-install
+fi
diff --git a/packages/auto-install/debian/auto-install-nonet.install b/packages/auto-install/debian/auto-install-nonet.install
new file mode 100644
index 0000000..93b4ff2
--- /dev/null
+++ b/packages/auto-install/debian/auto-install-nonet.install
@@ -0,0 +1 @@
+debian-installer-startup.d lib
diff --git a/packages/auto-install/debian/control b/packages/auto-install/debian/control
index 280d53d..c93b3fa 100644
--- a/packages/auto-install/debian/control
+++ b/packages/auto-install/debian/control
@@ -19,3 +19,11 @@ Depends: ${misc:Depends}, netcfg, preseed-common (>= 1.42)
XC-Package-Type: udeb
XB-Installer-Menu-Item: 1900
Description: Support for automatic installs
+ For inclusion in images that have netcfg.
+
+Package: auto-install-nonet
+Architecture: all
+Depends: ${misc:Depends}, preseed-common (>= 1.42)
+XC-Package-Type: udeb
+Description: Support for automatic installs
+ For inclusion in images that don't have netcfg.
--
1.6.6.1
From ba0230635fc69a34d08fe4a30d8b422688f5040d Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Wed, 3 Feb 2010 19:22:59 +0100
Subject: [PATCH 2/3] Split ai-choosers into separate udebs per "chooser"
The current system just blindly assumes that an image (or install)
will include both localechooser and kbd-chooser/console-setup, which
is not necessarily true.
So split the current udeb in three and make auto-install responsible
for installing a ai-chooser udeb only if the corresponding component
is actually used in the installation.
For images that include netcfg they should be included in the image
(together with the correcsponding component).
---
.../auto-install/debian/ai-choosers.isinstallable | 4 ---
.../debian/ai-console-setup-udeb.isinstallable | 4 +++
.../debian/ai-kbd-chooser.isinstallable | 4 +++
.../debian/ai-localechooser.isinstallable | 4 +++
packages/auto-install/debian/auto-install.postinst | 9 ++++++++
packages/auto-install/debian/control | 22 +++++++++++++++++--
6 files changed, 40 insertions(+), 7 deletions(-)
delete mode 100755 packages/auto-install/debian/ai-choosers.isinstallable
create mode 100755 packages/auto-install/debian/ai-console-setup-udeb.isinstallable
create mode 100755 packages/auto-install/debian/ai-kbd-chooser.isinstallable
create mode 100755 packages/auto-install/debian/ai-localechooser.isinstallable
diff --git a/packages/auto-install/debian/ai-choosers.isinstallable b/packages/auto-install/debian/ai-choosers.isinstallable
deleted file mode 100755
index 84f6554..0000000
--- a/packages/auto-install/debian/ai-choosers.isinstallable
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-. /usr/share/debconf/confmodule
-db_get auto-install/enable && [ true = "$RET" ] && exit 0
-exit 1
diff --git a/packages/auto-install/debian/ai-console-setup-udeb.isinstallable b/packages/auto-install/debian/ai-console-setup-udeb.isinstallable
new file mode 100755
index 0000000..84f6554
--- /dev/null
+++ b/packages/auto-install/debian/ai-console-setup-udeb.isinstallable
@@ -0,0 +1,4 @@
+#!/bin/sh
+. /usr/share/debconf/confmodule
+db_get auto-install/enable && [ true = "$RET" ] && exit 0
+exit 1
diff --git a/packages/auto-install/debian/ai-kbd-chooser.isinstallable b/packages/auto-install/debian/ai-kbd-chooser.isinstallable
new file mode 100755
index 0000000..84f6554
--- /dev/null
+++ b/packages/auto-install/debian/ai-kbd-chooser.isinstallable
@@ -0,0 +1,4 @@
+#!/bin/sh
+. /usr/share/debconf/confmodule
+db_get auto-install/enable && [ true = "$RET" ] && exit 0
+exit 1
diff --git a/packages/auto-install/debian/ai-localechooser.isinstallable b/packages/auto-install/debian/ai-localechooser.isinstallable
new file mode 100755
index 0000000..84f6554
--- /dev/null
+++ b/packages/auto-install/debian/ai-localechooser.isinstallable
@@ -0,0 +1,4 @@
+#!/bin/sh
+. /usr/share/debconf/confmodule
+db_get auto-install/enable && [ true = "$RET" ] && exit 0
+exit 1
diff --git a/packages/auto-install/debian/auto-install.postinst b/packages/auto-install/debian/auto-install.postinst
index 33bd0bb..6106922 100755
--- a/packages/auto-install/debian/auto-install.postinst
+++ b/packages/auto-install/debian/auto-install.postinst
@@ -5,6 +5,15 @@ set -e
. /usr/share/debconf/confmodule
. /lib/preseed/preseed.sh
+# Install ai-choosers
+pinst=
+for p in localechooser kbd-chooser console-setup-udeb; do
+ if [ -e /var/lib/dpkg/info/$p.postinst ]; then
+ pinst="$pinst ai-$p"
+ fi
+done
+[ -z "$pinst" ] || anna-install $pinst || true
+
if [ -e /var/run/preseed_unspecified_at_boot ] ; then
if [ -n "$(dhcp_preseed_url)" ]; then
rm /var/run/preseed_unspecified_at_boot
diff --git a/packages/auto-install/debian/control b/packages/auto-install/debian/control
index c93b3fa..c263d41 100644
--- a/packages/auto-install/debian/control
+++ b/packages/auto-install/debian/control
@@ -5,11 +5,27 @@ Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
Uploaders: Philip Hands <phil@hands.com>
Build-Depends: debhelper (>= 7.3.10), dpkg-dev (>= 1.9)
-Package: ai-choosers
+Package: ai-localechooser
Architecture: all
Priority: extra
-Depends: ${shlibs:Depends}, keyboard-setup, localechooser (>= 1.23)
-Description: Delayed configuration of locale and keyboard for auto-install
+Depends: ${shlibs:Depends}, localechooser (>= 1.23)
+Description: Delayed configuration of locale for auto-install
+XC-Package-Type: udeb
+XB-Installer-Menu-Item: 2200
+
+Package: ai-kbd-chooser
+Architecture: all
+Priority: extra
+Depends: ${shlibs:Depends}, kbd-chooser
+Description: Delayed configuration of keyboard for auto-install
+XC-Package-Type: udeb
+XB-Installer-Menu-Item: 2200
+
+Package: ai-console-setup-udeb
+Architecture: all
+Priority: extra
+Depends: ${shlibs:Depends}, console-setup-udeb
+Description: Delayed configuration of keyboard for auto-install
XC-Package-Type: udeb
XB-Installer-Menu-Item: 2200
--
1.6.6.1
From db93a236bd76c5f465d59528c2774626f9a38441 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Wed, 3 Feb 2010 18:51:52 +0100
Subject: [PATCH 3/3] Update inclusion of auto-install udebs
For CD-based installs only auto-install-nonet is included which avoids
netcfg getting pulled in.
For network-based installs we include auto-install and ai-chooser udebs
if their corresponding component is included.
---
installer/build/pkg-lists/cdrom-apus/common | 3 +--
installer/build/pkg-lists/cdrom/common | 3 +--
installer/build/pkg-lists/hd-media/common | 3 +--
installer/build/pkg-lists/monolithic/amd64.cfg | 1 +
installer/build/pkg-lists/monolithic/common | 2 +-
installer/build/pkg-lists/monolithic/i386.cfg | 1 +
installer/build/pkg-lists/monolithic/powerpc.cfg | 1 +
installer/build/pkg-lists/nativehd/common | 3 +--
installer/build/pkg-lists/nativehd/m68k.cfg | 1 +
installer/build/pkg-lists/netboot-apus/common | 1 -
installer/build/pkg-lists/netboot-apus/powerpc.cfg | 1 +
installer/build/pkg-lists/netboot/alpha.cfg | 1 +
installer/build/pkg-lists/netboot/amd64.cfg | 1 +
installer/build/pkg-lists/netboot/armeb.cfg | 1 +
installer/build/pkg-lists/netboot/armel.cfg | 1 +
installer/build/pkg-lists/netboot/common | 2 +-
installer/build/pkg-lists/netboot/hppa.cfg | 1 +
installer/build/pkg-lists/netboot/i386.cfg | 1 +
installer/build/pkg-lists/netboot/ia64.cfg | 1 +
installer/build/pkg-lists/netboot/m68k.cfg | 1 +
installer/build/pkg-lists/netboot/mips.cfg | 1 +
installer/build/pkg-lists/netboot/mipsel.cfg | 1 +
.../netboot/network-console/armel/iop32x.cfg | 1 +
.../netboot/network-console/armel/ixp4xx.cfg | 1 +
.../netboot/network-console/armel/kirkwood.cfg | 1 +
.../netboot/network-console/armel/orion5x.cfg | 2 ++
.../netboot/network-console/mipsel/cobalt.cfg | 1 +
installer/build/pkg-lists/netboot/powerpc.cfg | 1 +
installer/build/pkg-lists/netboot/sparc.cfg | 1 +
29 files changed, 29 insertions(+), 11 deletions(-)
diff --git a/installer/build/pkg-lists/cdrom-apus/common b/installer/build/pkg-lists/cdrom-apus/common
index c8029d4..b63c7c3 100644
--- a/installer/build/pkg-lists/cdrom-apus/common
+++ b/installer/build/pkg-lists/cdrom-apus/common
@@ -4,8 +4,7 @@
# Other udebs that are needed for CDROM install
installation-locale
localechooser
-auto-install
-ai-choosers
+auto-install-nonet
hw-detect
cdrom-detect
cdrom-retriever
diff --git a/installer/build/pkg-lists/cdrom/common b/installer/build/pkg-lists/cdrom/common
index 5abe092..7e530ee 100644
--- a/installer/build/pkg-lists/cdrom/common
+++ b/installer/build/pkg-lists/cdrom/common
@@ -4,8 +4,7 @@
# Other udebs that are needed for CDROM install
installation-locale
localechooser
-auto-install
-ai-choosers
+auto-install-nonet
hw-detect
cdrom-detect
cdrom-retriever
diff --git a/installer/build/pkg-lists/hd-media/common b/installer/build/pkg-lists/hd-media/common
index 4741778..4725245 100644
--- a/installer/build/pkg-lists/hd-media/common
+++ b/installer/build/pkg-lists/hd-media/common
@@ -3,8 +3,7 @@
installation-locale
localechooser
-auto-install
-ai-choosers
+auto-install-nonet
hw-detect
bogl-bterm-udeb
di-utils-terminfo
diff --git a/installer/build/pkg-lists/monolithic/amd64.cfg b/installer/build/pkg-lists/monolithic/amd64.cfg
index f89d76a..2c1a3db 100644
--- a/installer/build/pkg-lists/monolithic/amd64.cfg
+++ b/installer/build/pkg-lists/monolithic/amd64.cfg
@@ -1,5 +1,6 @@
console-keymaps-at
bogl-bterm-udeb
kbd-chooser
+ai-kbd-chooser
pcmciautils-udeb
acpi-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/monolithic/common b/installer/build/pkg-lists/monolithic/common
index cfaff49..94482a6 100644
--- a/installer/build/pkg-lists/monolithic/common
+++ b/installer/build/pkg-lists/monolithic/common
@@ -13,8 +13,8 @@
# priority udebs.
localechooser
+ai-localechooser
auto-install
-ai-choosers
rescue-mode
# Need to choose a mirror for debootstrap to download Debian from.
choose-mirror
diff --git a/installer/build/pkg-lists/monolithic/i386.cfg b/installer/build/pkg-lists/monolithic/i386.cfg
index 9be1650..3058f86 100644
--- a/installer/build/pkg-lists/monolithic/i386.cfg
+++ b/installer/build/pkg-lists/monolithic/i386.cfg
@@ -1,6 +1,7 @@
console-keymaps-at
bogl-bterm-udeb
kbd-chooser
+ai-kbd-chooser
pcmciautils-udeb
acpi-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/monolithic/powerpc.cfg b/installer/build/pkg-lists/monolithic/powerpc.cfg
index 311b630..09375f2 100644
--- a/installer/build/pkg-lists/monolithic/powerpc.cfg
+++ b/installer/build/pkg-lists/monolithic/powerpc.cfg
@@ -2,6 +2,7 @@ console-keymaps-at
console-keymaps-usb
bogl-bterm-udeb
kbd-chooser
+ai-kbd-chooser
pcmciautils-udeb
eject-udeb
# Used by yaboot-installer
diff --git a/installer/build/pkg-lists/nativehd/common b/installer/build/pkg-lists/nativehd/common
index 53b4f03..566d83d 100644
--- a/installer/build/pkg-lists/nativehd/common
+++ b/installer/build/pkg-lists/nativehd/common
@@ -4,8 +4,8 @@
# Other udebs that are needed for netboot install
localechooser
+ai-localechooser
auto-install
-ai-choosers
choose-mirror
net-retriever
download-installer
@@ -13,7 +13,6 @@ cdebconf-newt-udeb
cdebconf-newt-terminal ?
cdebconf-text-udeb
brltty-udeb
-kbd-chooser
installation-locale
bogl-bterm-udeb
di-utils-terminfo
diff --git a/installer/build/pkg-lists/nativehd/m68k.cfg b/installer/build/pkg-lists/nativehd/m68k.cfg
index 3f7d66e..d0dc4d9 100644
--- a/installer/build/pkg-lists/nativehd/m68k.cfg
+++ b/installer/build/pkg-lists/nativehd/m68k.cfg
@@ -2,6 +2,7 @@ console-keymaps-at
console-keymaps-amiga
console-keymaps-atari
kbd-chooser
+ai-kbd-chooser
nic-shared-modules-${kernel:Version}
file-preseed
network-preseed
diff --git a/installer/build/pkg-lists/netboot-apus/common b/installer/build/pkg-lists/netboot-apus/common
index c043ec5..64dcae7 100644
--- a/installer/build/pkg-lists/netboot-apus/common
+++ b/installer/build/pkg-lists/netboot-apus/common
@@ -4,7 +4,6 @@
# Other udebs that are needed for netboot install
localechooser
auto-install
-ai-choosers
choose-mirror
net-retriever
download-installer
diff --git a/installer/build/pkg-lists/netboot-apus/powerpc.cfg b/installer/build/pkg-lists/netboot-apus/powerpc.cfg
index c96053c..dc4c9cd 100644
--- a/installer/build/pkg-lists/netboot-apus/powerpc.cfg
+++ b/installer/build/pkg-lists/netboot-apus/powerpc.cfg
@@ -4,6 +4,7 @@ console-keymaps-amiga
nic-modules-${kernel:Version}
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/alpha.cfg b/installer/build/pkg-lists/netboot/alpha.cfg
index 985d549..9320d7e 100644
--- a/installer/build/pkg-lists/netboot/alpha.cfg
+++ b/installer/build/pkg-lists/netboot/alpha.cfg
@@ -7,6 +7,7 @@ nic-wireless-modules-${kernel:Version}
console-keymaps-at
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/amd64.cfg b/installer/build/pkg-lists/netboot/amd64.cfg
index 50ea757..ef17bfc 100644
--- a/installer/build/pkg-lists/netboot/amd64.cfg
+++ b/installer/build/pkg-lists/netboot/amd64.cfg
@@ -10,6 +10,7 @@ virtio-modules-${kernel:Version}
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
kbd-chooser
+ai-kbd-chooser
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/netboot/armeb.cfg b/installer/build/pkg-lists/netboot/armeb.cfg
index db2897d..0d8f79a 100644
--- a/installer/build/pkg-lists/netboot/armeb.cfg
+++ b/installer/build/pkg-lists/netboot/armeb.cfg
@@ -1,6 +1,7 @@
console-keymaps-at
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/armel.cfg b/installer/build/pkg-lists/netboot/armel.cfg
index 99cf8dc..8f3e96e 100644
--- a/installer/build/pkg-lists/netboot/armel.cfg
+++ b/installer/build/pkg-lists/netboot/armel.cfg
@@ -1,6 +1,7 @@
console-keymaps-at
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/common b/installer/build/pkg-lists/netboot/common
index be80f43..01c9b39 100644
--- a/installer/build/pkg-lists/netboot/common
+++ b/installer/build/pkg-lists/netboot/common
@@ -3,8 +3,8 @@
# Other udebs that are needed for netboot install
localechooser
+ai-localechooser
auto-install
-ai-choosers
choose-mirror
net-retriever
download-installer
diff --git a/installer/build/pkg-lists/netboot/hppa.cfg b/installer/build/pkg-lists/netboot/hppa.cfg
index f9341de..c8293e4 100644
--- a/installer/build/pkg-lists/netboot/hppa.cfg
+++ b/installer/build/pkg-lists/netboot/hppa.cfg
@@ -4,6 +4,7 @@ nic-modules-${kernel:Version}
console-keymaps-at
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/i386.cfg b/installer/build/pkg-lists/netboot/i386.cfg
index 65ddfe9..a4d35a4 100644
--- a/installer/build/pkg-lists/netboot/i386.cfg
+++ b/installer/build/pkg-lists/netboot/i386.cfg
@@ -10,6 +10,7 @@ virtio-modules-${kernel:Version}
usb-modules-${kernel:Version}
input-modules-${kernel:Version}
kbd-chooser
+ai-kbd-chooser
# This is needed for proper display of utf-8.
fb-modules-${kernel:Version}
diff --git a/installer/build/pkg-lists/netboot/ia64.cfg b/installer/build/pkg-lists/netboot/ia64.cfg
index 6a39806..1d6a45a 100644
--- a/installer/build/pkg-lists/netboot/ia64.cfg
+++ b/installer/build/pkg-lists/netboot/ia64.cfg
@@ -6,6 +6,7 @@ usb-modules-${kernel:Version}
input-modules-${kernel:Version}
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/m68k.cfg b/installer/build/pkg-lists/netboot/m68k.cfg
index eaad84e..ca3d0bc 100644
--- a/installer/build/pkg-lists/netboot/m68k.cfg
+++ b/installer/build/pkg-lists/netboot/m68k.cfg
@@ -1,5 +1,6 @@
console-keymaps-at
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/mips.cfg b/installer/build/pkg-lists/netboot/mips.cfg
index 1f675dd..3424a7a 100644
--- a/installer/build/pkg-lists/netboot/mips.cfg
+++ b/installer/build/pkg-lists/netboot/mips.cfg
@@ -1,6 +1,7 @@
console-keymaps-at
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/mipsel.cfg b/installer/build/pkg-lists/netboot/mipsel.cfg
index 0d138c9..12072c2 100644
--- a/installer/build/pkg-lists/netboot/mipsel.cfg
+++ b/installer/build/pkg-lists/netboot/mipsel.cfg
@@ -1,4 +1,5 @@
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/network-console/armel/iop32x.cfg b/installer/build/pkg-lists/netboot/network-console/armel/iop32x.cfg
index de98991..01944c4 100644
--- a/installer/build/pkg-lists/netboot/network-console/armel/iop32x.cfg
+++ b/installer/build/pkg-lists/netboot/network-console/armel/iop32x.cfg
@@ -12,3 +12,4 @@ input-modules-${kernel:Version}
# 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 -
+ai-localechooser -
diff --git a/installer/build/pkg-lists/netboot/network-console/armel/ixp4xx.cfg b/installer/build/pkg-lists/netboot/network-console/armel/ixp4xx.cfg
index a5ae509..df0a49f 100644
--- a/installer/build/pkg-lists/netboot/network-console/armel/ixp4xx.cfg
+++ b/installer/build/pkg-lists/netboot/network-console/armel/ixp4xx.cfg
@@ -10,3 +10,4 @@ nic-usb-modules-${kernel:Version}
# 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 -
+ai-localechooser -
diff --git a/installer/build/pkg-lists/netboot/network-console/armel/kirkwood.cfg b/installer/build/pkg-lists/netboot/network-console/armel/kirkwood.cfg
index 07440f1..2281c7f 100644
--- a/installer/build/pkg-lists/netboot/network-console/armel/kirkwood.cfg
+++ b/installer/build/pkg-lists/netboot/network-console/armel/kirkwood.cfg
@@ -11,3 +11,4 @@ qcontrol-udeb
# 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 -
+ai-localechooser -
diff --git a/installer/build/pkg-lists/netboot/network-console/armel/orion5x.cfg b/installer/build/pkg-lists/netboot/network-console/armel/orion5x.cfg
index d0fb0b7..671c7cb 100644
--- a/installer/build/pkg-lists/netboot/network-console/armel/orion5x.cfg
+++ b/installer/build/pkg-lists/netboot/network-console/armel/orion5x.cfg
@@ -17,8 +17,10 @@ micro-evtd-udeb
# 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 -
+ai-localechooser -
# The image is too big on QNAP unless we remove some stuff, and keyboard
# selection is currently not needed since all devices use serial console
# or ssh.
console-keymaps-at -
kbd-chooser -
+ai-kbd-chooser -
diff --git a/installer/build/pkg-lists/netboot/network-console/mipsel/cobalt.cfg b/installer/build/pkg-lists/netboot/network-console/mipsel/cobalt.cfg
index 3674c6b..fe0674a 100644
--- a/installer/build/pkg-lists/netboot/network-console/mipsel/cobalt.cfg
+++ b/installer/build/pkg-lists/netboot/network-console/mipsel/cobalt.cfg
@@ -2,3 +2,4 @@ pwgen-udeb
# 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 -
+ai-localechooser -
diff --git a/installer/build/pkg-lists/netboot/powerpc.cfg b/installer/build/pkg-lists/netboot/powerpc.cfg
index ac68fcc..f697dd6 100644
--- a/installer/build/pkg-lists/netboot/powerpc.cfg
+++ b/installer/build/pkg-lists/netboot/powerpc.cfg
@@ -14,6 +14,7 @@ floppy-modules-${kernel:Version}
usb-modules-${kernel:Version}
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/sparc.cfg b/installer/build/pkg-lists/netboot/sparc.cfg
index ad5a2fd..a1c7bda 100644
--- a/installer/build/pkg-lists/netboot/sparc.cfg
+++ b/installer/build/pkg-lists/netboot/sparc.cfg
@@ -1,4 +1,5 @@
kbd-chooser
+ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
--
1.6.6.1
Reply to: