summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2009-12-14 08:39:19 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:17:03 +0100
commitc1742e37188da8f1a8d0f98b1e08c1e530107462 (patch)
treec9cf09d41727d553e9b5dfdcdb300fe6564e5354
parent2e6e655346ffec16e5056fdcaa20f8fd5f8716ea (diff)
downloadlive-build-c1742e37188da8f1a8d0f98b1e08c1e530107462.zip
live-build-c1742e37188da8f1a8d0f98b1e08c1e530107462.tar.gz
Handling d-i required packages regarding kernel flavours differently on ubuntu.
-rwxr-xr-xhelpers/lh_binary_debian-installer22
1 files 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)