From 8168b7c92a3ef263d18cc2654b52b47d27b7f339 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Wed, 4 Oct 2017 10:31:20 -0700
Subject: [PATCH] Import patches-unapplied version 2.465 to
 ubuntu/artful-proposed

Imported using git-ubuntu import.

Changelog parent: be46ea0ff6cb5fa98654d747fc09465722727841

New changelog entries:
  * Skip installation of kernel headers for all minimal images
  * Use the kvm kernel flavor for minimized cloud image where available,
    not virtual.
---
 debian/changelog       |  8 ++++++++
 live-build/auto/config | 18 ++++++++++++++++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b98312c1..894485ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.465) artful; urgency=medium
+
+  * Skip installation of kernel headers for all minimal images
+  * Use the kvm kernel flavor for minimized cloud image where available,
+    not virtual.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Wed, 04 Oct 2017 10:31:20 -0700
+
 livecd-rootfs (2.464) artful; urgency=medium
 
   * Ignore failure of new autopkgtest on ppc64el, where it's not a
diff --git a/live-build/auto/config b/live-build/auto/config
index afeca134..23880265 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -239,7 +239,7 @@ esac
 SIGNED_KERNEL_PACKAGE="linux-signed-generic"
 
 if [ "${SUBPROJECT:-}" = minimized ]; then
-	OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal"
+	OPTS="${OPTS:+$OPTS }--bootstrap-flavour=minimal --linux-packages=linux-image"
 fi
 
 case $PROJECT in
@@ -531,14 +531,28 @@ 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 [ -z "$EXTRA_PPAS" ] && [ "$SUITE" != xenial ]; then
+				KERNEL_FLAVOURS=virtual
+			else
+				KERNEL_FLAVOURS=kvm
+			fi
 		else
 			add_task install minimal standard cloud-image
 			add_package install ubuntu-minimal
+			KERNEL_FLAVOURS=virtual
 		fi
 
 		BINARY_REMOVE_LINUX=false
 		OPTS="${OPTS:+$OPTS }--initramfs=none"
-		KERNEL_FLAVOURS=virtual
 		case $ARCH in
 			armhf)
 				KERNEL_FLAVOURS=generic-lpae