From bfa43c1c5ca2b253cf0e404569dbbd83027221c0 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Wed, 21 Mar 2018 11:05:46 +0000 Subject: [PATCH] On amd64, if building minimal images for bionic, xenial, or extra ppa, use kvm kernel, otherwise fallback to virtual. --- debian/changelog | 7 +++++++ live-build/auto/config | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index b6c93731..419a00f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.514) bionic; urgency=medium + + * On amd64, if building minimal images for bionic, xenial, or extra ppa, + use kvm kernel, otherwise fallback to virtual. + + -- Dimitri John Ledkov Wed, 21 Mar 2018 11:02:25 +0000 + livecd-rootfs (2.513) bionic; urgency=medium * In the live-server build, prevent casper from mounting any existing diff --git a/live-build/auto/config b/live-build/auto/config index 6dc8881f..e02f0512 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -624,10 +624,10 @@ case $PROJECT in # linux-kvm is available since you control the # archive and can provide this metapackage as # necessary. - if [ "$ARCH" != "amd64" ] || ([ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]); then - KERNEL_FLAVOURS=virtual - else + if [ "$ARCH" = "amd64" ] && ([ -n "$EXTRA_PPAS" ] || [ "$SUITE" = xenial ] || [ "$SUITE" = bionic ]); then KERNEL_FLAVOURS=kvm + else + KERNEL_FLAVOURS=virtual fi else add_task install minimal standard cloud-image