diff --git a/debian/changelog b/debian/changelog index 63db68e5..ee759daf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.531) UNRELEASED; urgency=medium + + * ubuntu-cpc: Use linux-kvm for all amd64 minimized builds (LP: #1775472). + + -- Daniel Watkins Wed, 06 Jun 2018 17:17:32 -0700 + livecd-rootfs (2.530) cosmic; urgency=medium * ubuntu-cpc: Reintroduce the -root.tar.xz artifact (LP: #1585233). diff --git a/live-build/auto/config b/live-build/auto/config index 069a69dc..da99afa1 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -600,16 +600,9 @@ case $PROJECT in if [ "${SUBPROJECT:-}" = minimized ]; then add_task install cloud-image add_package install sudo - # linux-kvm currently only exists in xenial, not in - # non-LTS suites. Fall back to virtual flavor, which - # may or may not boot initramfsless but enables us to - # test building and possibly build derivative images - # using other kernel flavors. - # If you enable an extra ppa, it is assumed that - # linux-kvm is available since you control the - # archive and can provide this metapackage as - # necessary. - if [ "$ARCH" = "amd64" ] && ([ -n "$EXTRA_PPAS" ] || [ "$SUITE" = xenial ] || [ "$SUITE" = bionic ]); then + # linux-kvm currently only exists for amd64, so fall back to the + # virtual flavour for other architectures + if [ "$ARCH" = "amd64" ]; then KERNEL_FLAVOURS=kvm else KERNEL_FLAVOURS=virtual