Bug#383896: base-installer: Should use both extra package templates

[Petter Reinholdtsen <pere@hungry.com>]

Package: base-installer
Version: 1.66
Tags: patch

When trying to install usplash before the kernel, to avoid running
update-initramfs more than once, I preseeded the package in the
base-installer/kernel/linux/extra-packages template, expecting this to
solve the issue.  It had no effect.

I discovered I had to use the
base-installer/kernel/linux/extra-packages-2.6 template instead.  I
expected base-installer/kernel/linux/extra-packages template to be
used for all kernels, whlie
base-installer/kernel/linux/extra-packages-2.6 used only for 2.6
kenrels, while in reallity, the values in
base-installer/kernel/linux/extra-packages are never used as the
db_get for base-installer/kernel/linux/extra-packages-2.6 will always
succeed.

I suggest rewriting the code to always use the content in
base-installer/kernel/linux/extra-packages, and use the kernel
specific version when the kernel version matches the variable.  Here
is a patch to implement it.

Index: debian/postinst
===================================================================
--- debian/postinst     (revisjon 40022)
+++ debian/postinst     (arbeidskopi)
@@ -708,12 +710,11 @@
                done

                # Install any extra (kernel related) packages
+               EXTRAS=
                if db_get "base-installer/kernel/linux/extra-packages-$target_kernel_major"; then
-                       EXTRAS="$RET"
-               elif db_get base-installer/kernel/linux/extra-packages; then
-                       EXTRAS="$RET"
-               else
-                       EXTRAS=
+                       EXTRAS="$EXTRAS $RET"
+               if db_get base-installer/kernel/linux/extra-packages; then
+                       EXTRAS="$EXTRAS $RET"
                fi
                for package in $EXTRAS; do
                        info "Installing $package."