diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-03 15:53:27 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2015-05-03 16:03:10 +0200 |
| commit | 279a149d8a2e01a7fbb7e002c5a38e4b82ccd74e (patch) | |
| tree | 15e180ee76e6665f52f6b32bffc633605e002615 /scripts/build/installer_debian-installer | |
| parent | f93e83e351193a93c0a529798f7d01997c9d0909 (diff) | |
| download | vyos-live-build-279a149d8a2e01a7fbb7e002c5a38e4b82ccd74e.tar.gz vyos-live-build-279a149d8a2e01a7fbb7e002c5a38e4b82ccd74e.zip | |
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.
Diffstat (limited to 'scripts/build/installer_debian-installer')
| -rwxr-xr-x | scripts/build/installer_debian-installer | 40 |
1 files changed, 3 insertions, 37 deletions
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 |