diff options
| author | Colin Watson <cjwatson@ubuntu.com> | 2012-09-30 09:28:16 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-09-30 09:28:55 +0200 |
| commit | 01b64bf2b9b99df5dbeb7211646f5203a4f7bc00 (patch) | |
| tree | 9ce36d0c2e853b670af9c6cc7e4eb239ebb86abd | |
| parent | 7ae630cc4388a7fc01fb58351556a7cb1409bb69 (diff) | |
| download | vyos-live-build-01b64bf2b9b99df5dbeb7211646f5203a4f7bc00.tar.gz vyos-live-build-01b64bf2b9b99df5dbeb7211646f5203a4f7bc00.zip | |
Using i386 -generic-pae kernel flavour on Ubuntu precise.
| -rwxr-xr-x | functions/defaults.sh | 9 | ||||
| -rwxr-xr-x | scripts/build/binary_debian-installer | 9 |
2 files changed, 16 insertions, 2 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index e1c640cbe..872dd53e2 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -717,7 +717,14 @@ Set_defaults () ;; ubuntu|kubuntu) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" + case "${LB_DISTRIBUTION}" in + precise) + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}" + ;; + *) + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" + ;; + esac ;; *) diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index 1a8543913..9720961cf 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -357,7 +357,14 @@ then case "${LB_MODE}" in ubuntu|kubuntu) - DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" + case "${LB_DISTRIBUTION}" in + precise) + DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae" + ;; + *) + DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic" + ;; + esac ;; *) |