From 279a149d8a2e01a7fbb7e002c5a38e4b82ccd74e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 3 May 2015 15:53:27 +0200 Subject: Dropping automagics for ubuntu. Future live-build versions will still allow to use casper, but its configuration will be done differently by a custom config tree, rather than embedded and maintenance intensive code in live-build itself. --- scripts/build/installer_debian-installer | 40 +++----------------------------- 1 file changed, 3 insertions(+), 37 deletions(-) (limited to 'scripts/build/installer_debian-installer') diff --git a/scripts/build/installer_debian-installer b/scripts/build/installer_debian-installer index ed1adf411..8b09ec08f 100755 --- a/scripts/build/installer_debian-installer +++ b/scripts/build/installer_debian-installer @@ -317,51 +317,17 @@ then case "${LB_ARCHITECTURES}" in amd64) DI_REQ_PACKAGES="lilo grub-pc" - - case "${LB_MODE}" in - ubuntu) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" - ;; - - *) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64" - ;; - esac + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-amd64" ;; i386) DI_REQ_PACKAGES="elilo lilo grub-pc" - - case "${LB_MODE}" in - ubuntu) - case "${LB_DISTRIBUTION}" in - precise) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae" - ;; - - *) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" - ;; - esac - ;; - - *) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-586 linux-image-686-pae" - ;; - esac + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-586 linux-image-686-pae" ;; powerpc) DI_REQ_PACKAGES="yaboot" - case "${LB_MODE}" in - ubuntu) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp linux-image-powerpc-e500 linux-image-powerpc-e500mc" - ;; - - *) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp" - ;; - esac + DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64 linux-image-powerpc-smp" ;; esac -- cgit v1.2.3