[d-i-commits] r32042 - trunk/packages/base-installer/debian

[Colin Watson]

Author: cjwatson
Date: 2005-11-14 16:38:48 +0000 (Mon, 14 Nov 2005)
New Revision: 32042

Modified:
   trunk/packages/base-installer/debian/changelog
   trunk/packages/base-installer/debian/postinst
   trunk/packages/base-installer/debian/templates-arch
Log:
* Allow extra packages to be installed along with init*-tools, controlled
  by base-installer/kernel/linux/extra-packages* templates. This allows
  derivatives to install initramfs hooks such as usplash.

Modified: trunk/packages/base-installer/debian/changelog
===================================================================
--- trunk/packages/base-installer/debian/changelog	2005-11-14 16:34:01 UTC (rev 32041)
+++ trunk/packages/base-installer/debian/changelog	2005-11-14 16:38:48 UTC (rev 32042)
@@ -53,6 +53,9 @@
     and ia64, as the most current information I have indicates that
     initramfs-tools doesn't work there; porters should feel free to update
     this. I've left notes for where I think yaird could best be slotted in.
+  * Allow extra packages to be installed along with init*-tools, controlled
+    by base-installer/kernel/linux/extra-packages* templates. This allows
+    derivatives to install initramfs hooks such as usplash.
 
  -- Sven Luther <luther at debian.org>  Mon, 14 Nov 2005 14:09:20 +0000
 

Modified: trunk/packages/base-installer/debian/postinst
===================================================================
--- trunk/packages/base-installer/debian/postinst	2005-11-14 16:34:01 UTC (rev 32041)
+++ trunk/packages/base-installer/debian/postinst	2005-11-14 16:38:48 UTC (rev 32042)
@@ -573,6 +573,21 @@
 			exit_error base-installer/kernel/failed-package-install
 		fi
 
+		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=
+		fi
+		for package in $EXTRAS; do
+			info "Installing $package."
+			db_subst base-installer/section/install_kernel_package SUBST0 "$package"
+			db_progress INFO base-installer/section/install_kernel_package
+			# The package might not exist; don't worry about it.
+			apt-install "$package" 2>> $LOGFILE || true
+		done
+
 		if [ "$do_initramfs" = no ]; then
 			# Temporarily hardcode the root partition.
 			# This isn't needed with initramfs-tools (TODO:

Modified: trunk/packages/base-installer/debian/templates-arch
===================================================================
--- trunk/packages/base-installer/debian/templates-arch	2005-11-14 16:34:01 UTC (rev 32041)
+++ trunk/packages/base-installer/debian/templates-arch	2005-11-14 16:38:48 UTC (rev 32042)
@@ -50,6 +50,16 @@
 # defaults if you want to select among different initramfs creation tools.
 Description: use an initramfs (linux 2.6 only)
 
+Template: base-installer/kernel/linux/extra-packages
+Type: string
+Default:
+Description: extra packages to install with init*-tools (linux only)
+
+Template: base-installer/kernel/linux/extra-packages-2.6
+Type: string
+Default:
+Description: extra packages to install with init*-tools (linux 2.6 only)
+
 Template: base-installer/kernel/linux/link_in_boot
 Type: boolean
 Default: true