Or rather, let's integrate the functionality in the preseed udeb but at the same time remove the need for all separate auto-install udebs. The first patch is what makes this possible. It modifies main-menu so that it will automagically run components, that were not installable from the start of D-I, when their isinstallable script no longer fails. This means we no longer need the ai-* udebs with their artificial dependencies. The second patch integrates remaining auto-install functionality in the preseed udeb: - a startup script [1] now takes care of checking if auto-install is enabled; a lot cleaner than having localechooser do that - the url expansion is really an extension of network-preseed and thus integrated in that (for now I've left it as a separate script, but it should probably be integrated in the postinst) - the choosers are enabled again when network-preseed runs The third patch updates the isinstallable scripts for localechooser and kbd-chooser. The fourth patch removes auto-install and ai-* udebs from all pkg-lists. IMO this makes for a much cleaner framework and, most importantly, it gets rid of the strange extra menu items that appeared during auto-installs (and the errors in the syslog because their menu title cannot be found). Comments? Cheers, FJP [1] The Sxx numbers of the preseed d-i-startup.d scripts could probably do with some renumbering so they are less scattered.
From 3062cedb58306abfdce4dea34f2a69a9c4d5b6b7 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Tue, 23 Feb 2010 11:39:10 +0100
Subject: [PATCH 3/4] Update isinstallable scripts for choosers for new auto-install framework
---
.../kbd-chooser/debian/kbd-chooser.isinstallable | 9 ++++++-
.../debian/localechooser.isinstallable | 23 +++----------------
2 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/packages/kbd-chooser/debian/kbd-chooser.isinstallable b/packages/kbd-chooser/debian/kbd-chooser.isinstallable
index 9cfb65a..c7b7839 100755
--- a/packages/kbd-chooser/debian/kbd-chooser.isinstallable
+++ b/packages/kbd-chooser/debian/kbd-chooser.isinstallable
@@ -1,4 +1,9 @@
#!/bin/sh
-. /usr/share/debconf/confmodule
-[ -e /var/run/delay_choosers ] && exit 1
+
+file=/var/run/auto-install.active
+
+if [ -e $file ]; then
+ exit $(cat $file)
+fi
+
exit 0
diff --git a/packages/localechooser/debian/localechooser.isinstallable b/packages/localechooser/debian/localechooser.isinstallable
index 20882e4..c7b7839 100755
--- a/packages/localechooser/debian/localechooser.isinstallable
+++ b/packages/localechooser/debian/localechooser.isinstallable
@@ -1,24 +1,9 @@
#!/bin/sh
-. /usr/share/debconf/confmodule
-been_tried=/var/run/localechooser.been_tried
-if [ ! -e $been_tried ] ; then
- touch $been_tried
- if db_get auto-install/enable && [ "$RET" = true ]; then
- # find at least one preseed
- if [ -e /preseed.cfg ] ||
- { db_get preseed/url && [ "$RET" ]; } ||
- { db_get preseed/file && [ "$RET" ]; }; then
- # ok, so delay locale & kbd choice
- touch /var/run/delay_choosers
- exit 1
- else
- # otherwise, tell auto-install (and others) that the preseed wasn't specified
- touch /var/run/preseed_unspecified_at_boot
- fi
- fi
-else
- [ -e /var/run/delay_choosers ] && exit 1
+file=/var/run/auto-install.active
+
+if [ -e $file ]; then
+ exit $(cat $file)
fi
exit 0
--
1.6.6.1
From 571096e72d476dd50859a587708c877f1dc8e9fe Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Tue, 23 Feb 2010 10:20:47 +0100
Subject: [PATCH 1/4] Don't mark menu items that are not installable as "seen"
This will allow auto-install to be simplified as the ai-chooser udebs will
no longer be needed: any delayed menu items will get run automagically when
their isinstallable script no longer fails (unless they had already been
"seen" before they were disabled).
---
packages/main-menu/main-menu.c | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/packages/main-menu/main-menu.c b/packages/main-menu/main-menu.c
index 41796fa..8954f11 100644
--- a/packages/main-menu/main-menu.c
+++ b/packages/main-menu/main-menu.c
@@ -32,6 +32,7 @@ const int RAISE = 1;
const int LOWER = 0;
di_hash_table *seen_items;
+di_hash_table *notinstallables;
int last_successful_item = -1;
/* Save default priority, to be able to return to it when we have to lower it */
@@ -95,6 +96,13 @@ static void seen_items_key_destroy (void *key)
di_free(s);
}
+static void notinstallables_key_destroy (void *key)
+{
+ di_rstring *s = key;
+ di_free(s->string);
+ di_free(s);
+}
+
int isdefault(di_system_package *p) {
int check;
@@ -120,6 +128,13 @@ bool isinstallable(di_system_package *p) {
check = di_system_dpkg_package_control_file_exec(&p->p, "isinstallable", 0, NULL);
if (check <= 0)
return true;
+
+ /* Add to table listing not installable packages */
+ di_rstring *p_name = di_new0(di_rstring, 1);
+ p_name->string = di_stradup(p->p.key.string, p->p.key.size);
+ p_name->size = p->p.key.size;
+ di_hash_table_insert(notinstallables, p_name, p_name);
+
return false;
}
@@ -162,6 +177,13 @@ get_default_menu_item(di_slist *list)
di_system_package *p;
di_slist_node *node;
+ /* Create table listing not installable packages from scratch as
+ * the isinstallable status can change at any time
+ */
+ di_hash_table_destroy(notinstallables);
+ notinstallables = di_hash_table_new_full(di_rstring_hash, di_rstring_equal,
+ notinstallables_key_destroy, NULL);
+
/* Traverse the list, return the first menu item that isn't installed */
for (node = list->head; node != NULL; node = node->next) {
p = node->data;
@@ -169,7 +191,7 @@ get_default_menu_item(di_slist *list)
if (!p->installer_menu_item ||
p->p.status == di_package_status_installed ||
!isinstallable(p)) {
- //di_log(DI_LOG_LEVEL_DEBUG, "not menu item; or not installed");
+ //di_log(DI_LOG_LEVEL_DEBUG, "not a menu item, not installed or not installable");
continue;
}
if (p->installer_menu_item >= NEVERDEFAULT) {
@@ -641,6 +663,8 @@ int main (int argc __attribute__ ((unused)), char **argv) {
seen_items = di_hash_table_new_full(di_rstring_hash, di_rstring_equal,
seen_items_key_destroy, NULL);
+ notinstallables = di_hash_table_new_full(di_rstring_hash, di_rstring_equal,
+ notinstallables_key_destroy, NULL);
exit_loop = 0;
allocator = di_system_packages_allocator_alloc ();
@@ -686,7 +710,8 @@ int main (int argc __attribute__ ((unused)), char **argv) {
seen_name->string = di_stradup(seen->p.key.string,
seen->p.key.size);
seen_name->size = seen->p.key.size;
- di_hash_table_insert(seen_items, seen_name, seen_name);
+ if (! di_hash_table_lookup(notinstallables, &seen->p.key))
+ di_hash_table_insert(seen_items, seen_name, seen_name);
}
di_packages_free (packages);
--
1.6.6.1
From 3e018a7d52d11f8c43a54adbe79f246c6aa44f8e Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Tue, 23 Feb 2010 11:25:36 +0100
Subject: [PATCH 2/4] Integrate auto-install support in the preseed udeb
---
packages/preseed/auto-install.sh | 44 ++++++++++++++++++++
.../debian-installer-startup.d/S40auto-install | 16 +++++++
packages/preseed/debian/network-preseed.install | 1 +
packages/preseed/debian/network-preseed.postinst | 5 ++
packages/preseed/debian/network-preseed.templates | 13 +++++-
packages/preseed/debian/preseed-common.install | 1 +
6 files changed, 79 insertions(+), 1 deletions(-)
create mode 100755 packages/preseed/auto-install.sh
create mode 100755 packages/preseed/debian-installer-startup.d/S40auto-install
create mode 100644 packages/preseed/debian/network-preseed.install
diff --git a/packages/preseed/auto-install.sh b/packages/preseed/auto-install.sh
new file mode 100755
index 0000000..530baae
--- /dev/null
+++ b/packages/preseed/auto-install.sh
@@ -0,0 +1,44 @@
+#!/bin/sh
+
+set -e
+
+. /usr/share/debconf/confmodule
+. /lib/preseed/preseed.sh
+
+if [ -e /var/run/preseed_unspecified_at_boot ]; then
+ if [ -n "$(dhcp_preseed_url)" ]; then
+ rm /var/run/preseed_unspecified_at_boot
+ else
+ db_input critical preseed/url || true
+ db_go || true
+ fi
+fi
+
+db_get preseed/url && url="$RET"
+[ "$url" ] || exit 0
+
+if [ "${url%%://*}" != "$url" ]; then
+ proto="${url%%://*}"
+ base="${url#*://}"
+else
+ proto=http
+ base="$url"
+fi
+
+if ! expr "$base" : [^/]*$ >/dev/null; then
+ host="${base%%/*}"
+ dir="${base#*/}"
+else
+ host="$base"
+ db_get auto-install/defaultroot && dir="$RET"
+fi
+
+if expr $host : [^.]*$ >/dev/null; then
+ db_get netcfg/get_domain && domain="$RET"
+
+ if [ -n "$domain" ] && [ "$domain" != "unnassigned-domain" ]; then
+ host="$host.$domain"
+ fi
+fi
+
+db_set preseed/url $proto://$host/$dir
diff --git a/packages/preseed/debian-installer-startup.d/S40auto-install b/packages/preseed/debian-installer-startup.d/S40auto-install
new file mode 100755
index 0000000..ca3644b
--- /dev/null
+++ b/packages/preseed/debian-installer-startup.d/S40auto-install
@@ -0,0 +1,16 @@
+#! /bin/sh
+
+. /usr/share/debconf/confmodule
+
+if db_get auto-install/enable && [ "$RET" = true ]; then
+ # find at least one preseed
+ if [ -e /preseed.cfg ] ||
+ { db_get preseed/url && [ "$RET" ]; } ||
+ { db_get preseed/file && [ "$RET" ]; }; then
+ # disable locale & kbd selection
+ echo 1 >/var/run/auto-install.active
+ else
+ # register that no preseed was specified
+ touch /var/run/preseed_unspecified_at_boot
+ fi
+fi
diff --git a/packages/preseed/debian/network-preseed.install b/packages/preseed/debian/network-preseed.install
new file mode 100644
index 0000000..c2fa9c6
--- /dev/null
+++ b/packages/preseed/debian/network-preseed.install
@@ -0,0 +1 @@
+auto-install.sh /lib/preseed
diff --git a/packages/preseed/debian/network-preseed.postinst b/packages/preseed/debian/network-preseed.postinst
index 6db8f86..bf651f4 100755
--- a/packages/preseed/debian/network-preseed.postinst
+++ b/packages/preseed/debian/network-preseed.postinst
@@ -4,6 +4,11 @@ set -e
. /usr/share/debconf/confmodule
. /lib/preseed/preseed.sh
+# Re-enable locale and kbd selection
+echo 0 >/var/run/auto-install.active
+
+/lib/preseed/auto-install.sh
+
dhcp_url=$(dhcp_preseed_url)
if [ -n "$dhcp_url" ]; then
preseed_location "$dhcp_url"
diff --git a/packages/preseed/debian/network-preseed.templates b/packages/preseed/debian/network-preseed.templates
index 1b9a955..2927a10 100644
--- a/packages/preseed/debian/network-preseed.templates
+++ b/packages/preseed/debian/network-preseed.templates
@@ -25,8 +25,19 @@ Description: Location of initial preconfiguration file:
.
See http://wiki.debian.org/DebianInstaller/Preseed for inspiration.
-
Template: preseed/url/checksum
Type: string
Description: for internal use; can be preseeded
Optional md5sum (or sums) for the preconfiguration files
+
+Template: auto-install/enable
+Type: boolean
+Default: false
+Description: for internal use; can be preseeded
+ If true, attempt a fully automatic install
+
+Template: auto-install/defaultroot
+Type: string
+Default: d-i/squeeze/./preseed.cfg
+Description: for internal use; can be preseeded
+ Path added to local server to give the preseed root
diff --git a/packages/preseed/debian/preseed-common.install b/packages/preseed/debian/preseed-common.install
index ea7cea7..532256a 100644
--- a/packages/preseed/debian/preseed-common.install
+++ b/packages/preseed/debian/preseed-common.install
@@ -2,5 +2,6 @@ preseed.sh lib/preseed
preseed_command bin
preseed_fetch bin
debconf-set-selections bin
+debian-installer-startup.d/S40auto-install lib/debian-installer-startup.d
finish-install.d/07preseed usr/lib/finish-install.d
post-base-installer.d/05preseed usr/lib/post-base-installer.d
--
1.6.6.1
From 6ca14fe33313025d492376bd5dd6b8e7f5912e85 Mon Sep 17 00:00:00 2001
From: Frans Pop <fjp@debian.org>
Date: Tue, 23 Feb 2010 11:00:19 +0100
Subject: [PATCH 4/4] Drop auto-install from pkg-lists
---
installer/build/pkg-lists/cdrom-apus/common | 1 -
installer/build/pkg-lists/cdrom/common | 1 -
installer/build/pkg-lists/hd-media/common | 1 -
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 | 2 --
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 -
.../build/pkg-lists/netboot/network-console/common | 5 -----
installer/build/pkg-lists/netboot/powerpc.cfg | 1 -
installer/build/pkg-lists/netboot/sparc.cfg | 1 -
25 files changed, 0 insertions(+), 32 deletions(-)
diff --git a/installer/build/pkg-lists/cdrom-apus/common b/installer/build/pkg-lists/cdrom-apus/common
index b63c7c3..69e5767 100644
--- a/installer/build/pkg-lists/cdrom-apus/common
+++ b/installer/build/pkg-lists/cdrom-apus/common
@@ -4,7 +4,6 @@
# Other udebs that are needed for CDROM install
installation-locale
localechooser
-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 7e530ee..ca63580 100644
--- a/installer/build/pkg-lists/cdrom/common
+++ b/installer/build/pkg-lists/cdrom/common
@@ -4,7 +4,6 @@
# Other udebs that are needed for CDROM install
installation-locale
localechooser
-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 4725245..395511e 100644
--- a/installer/build/pkg-lists/hd-media/common
+++ b/installer/build/pkg-lists/hd-media/common
@@ -3,7 +3,6 @@
installation-locale
localechooser
-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 2c1a3db..f89d76a 100644
--- a/installer/build/pkg-lists/monolithic/amd64.cfg
+++ b/installer/build/pkg-lists/monolithic/amd64.cfg
@@ -1,6 +1,5 @@
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 94482a6..82b1fb7 100644
--- a/installer/build/pkg-lists/monolithic/common
+++ b/installer/build/pkg-lists/monolithic/common
@@ -13,8 +13,6 @@
# priority udebs.
localechooser
-ai-localechooser
-auto-install
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 3058f86..9be1650 100644
--- a/installer/build/pkg-lists/monolithic/i386.cfg
+++ b/installer/build/pkg-lists/monolithic/i386.cfg
@@ -1,7 +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/powerpc.cfg b/installer/build/pkg-lists/monolithic/powerpc.cfg
index 09375f2..311b630 100644
--- a/installer/build/pkg-lists/monolithic/powerpc.cfg
+++ b/installer/build/pkg-lists/monolithic/powerpc.cfg
@@ -2,7 +2,6 @@ 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 566d83d..0a76ebd 100644
--- a/installer/build/pkg-lists/nativehd/common
+++ b/installer/build/pkg-lists/nativehd/common
@@ -4,8 +4,6 @@
# Other udebs that are needed for netboot install
localechooser
-ai-localechooser
-auto-install
choose-mirror
net-retriever
download-installer
diff --git a/installer/build/pkg-lists/nativehd/m68k.cfg b/installer/build/pkg-lists/nativehd/m68k.cfg
index d0dc4d9..3f7d66e 100644
--- a/installer/build/pkg-lists/nativehd/m68k.cfg
+++ b/installer/build/pkg-lists/nativehd/m68k.cfg
@@ -2,7 +2,6 @@ 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 64dcae7..16c0db0 100644
--- a/installer/build/pkg-lists/netboot-apus/common
+++ b/installer/build/pkg-lists/netboot-apus/common
@@ -3,7 +3,6 @@
# Other udebs that are needed for netboot install
localechooser
-auto-install
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 dc4c9cd..c96053c 100644
--- a/installer/build/pkg-lists/netboot-apus/powerpc.cfg
+++ b/installer/build/pkg-lists/netboot-apus/powerpc.cfg
@@ -4,7 +4,6 @@ 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 9320d7e..985d549 100644
--- a/installer/build/pkg-lists/netboot/alpha.cfg
+++ b/installer/build/pkg-lists/netboot/alpha.cfg
@@ -7,7 +7,6 @@ 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 ef17bfc..50ea757 100644
--- a/installer/build/pkg-lists/netboot/amd64.cfg
+++ b/installer/build/pkg-lists/netboot/amd64.cfg
@@ -10,7 +10,6 @@ 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 0d8f79a..db2897d 100644
--- a/installer/build/pkg-lists/netboot/armeb.cfg
+++ b/installer/build/pkg-lists/netboot/armeb.cfg
@@ -1,7 +1,6 @@
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 8f3e96e..99cf8dc 100644
--- a/installer/build/pkg-lists/netboot/armel.cfg
+++ b/installer/build/pkg-lists/netboot/armel.cfg
@@ -1,7 +1,6 @@
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 01c9b39..1585074 100644
--- a/installer/build/pkg-lists/netboot/common
+++ b/installer/build/pkg-lists/netboot/common
@@ -3,8 +3,6 @@
# Other udebs that are needed for netboot install
localechooser
-ai-localechooser
-auto-install
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 c8293e4..f9341de 100644
--- a/installer/build/pkg-lists/netboot/hppa.cfg
+++ b/installer/build/pkg-lists/netboot/hppa.cfg
@@ -4,7 +4,6 @@ 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 a4d35a4..65ddfe9 100644
--- a/installer/build/pkg-lists/netboot/i386.cfg
+++ b/installer/build/pkg-lists/netboot/i386.cfg
@@ -10,7 +10,6 @@ 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 1d6a45a..6a39806 100644
--- a/installer/build/pkg-lists/netboot/ia64.cfg
+++ b/installer/build/pkg-lists/netboot/ia64.cfg
@@ -6,7 +6,6 @@ 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 ca3d0bc..eaad84e 100644
--- a/installer/build/pkg-lists/netboot/m68k.cfg
+++ b/installer/build/pkg-lists/netboot/m68k.cfg
@@ -1,6 +1,5 @@
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 3424a7a..1f675dd 100644
--- a/installer/build/pkg-lists/netboot/mips.cfg
+++ b/installer/build/pkg-lists/netboot/mips.cfg
@@ -1,7 +1,6 @@
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 12072c2..0d138c9 100644
--- a/installer/build/pkg-lists/netboot/mipsel.cfg
+++ b/installer/build/pkg-lists/netboot/mipsel.cfg
@@ -1,5 +1,4 @@
kbd-chooser
-ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
diff --git a/installer/build/pkg-lists/netboot/network-console/common b/installer/build/pkg-lists/netboot/network-console/common
index 7646c01..5a98cf5 100644
--- a/installer/build/pkg-lists/netboot/network-console/common
+++ b/installer/build/pkg-lists/netboot/network-console/common
@@ -7,8 +7,3 @@ localechooser -
# (and the devices for which it's used).
kbd-chooser -
console-keymaps-at -
-# Also remove auto-install stuff as that's effectively already implemented
-# in these images.
-auto-install -
-ai-localechooser -
-ai-kbd-chooser -
diff --git a/installer/build/pkg-lists/netboot/powerpc.cfg b/installer/build/pkg-lists/netboot/powerpc.cfg
index f697dd6..ac68fcc 100644
--- a/installer/build/pkg-lists/netboot/powerpc.cfg
+++ b/installer/build/pkg-lists/netboot/powerpc.cfg
@@ -14,7 +14,6 @@ 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 5bcff3a..d061a89 100644
--- a/installer/build/pkg-lists/netboot/sparc.cfg
+++ b/installer/build/pkg-lists/netboot/sparc.cfg
@@ -1,5 +1,4 @@
kbd-chooser
-ai-kbd-chooser
bogl-bterm-udeb
hw-detect
ethdetect
--
1.6.6.1
Attachment:
signature.asc
Description: This is a digitally signed message part.