Subject: Handling d-i required packages regarding kernel flavours differently on ubuntu.

From: Daniel Baumann <[email-masked]>
Date: Mon, 14 Dec 2009 08:39:19 +0100

---
 helpers/lh_binary_debian-installer | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer
index 7f5af95..cb1af38 100755
--- a/helpers/lh_binary_debian-installer
+++ b/helpers/lh_binary_debian-installer
@@ -323,12 +323,30 @@ then
 	case "${LH_ARCHITECTURE}" in
 		amd64)
 			DI_REQ_PACKAGES="lilo grub"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-amd64"
+
+			case "${LH_MODE}" in
+				ubuntu)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
+					;;
+
+				*)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-amd64"
+					;;
+			esac
 			;;
 
 		i386)
 			DI_REQ_PACKAGES="elilo lilo grub"
-			DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-486 linux-image-2.6-686"
+
+			case "${LH_MODE}" in
+				ubuntu)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-generic"
+					;;
+
+				*)
+					DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-2.6-486 linux-image-2.6-686"
+					;;
+			esac
 			;;
 
 		sparc)
-- 
cgit v1.0