[SCM] live-helper branch, debian, updated. debian/2.0_a3-1-1-g16e4ef3

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 16e4ef3966c1305b9e0acc2b2fa7a3c0df1e8bce
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Dec 14 08:39:19 2009 +0100

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

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)

-- 
live-helper