From 118c6476a962cbdc0a61dd8384f65265a9cb8e98 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Sat, 21 Oct 2017 20:53:02 -0700
Subject: [PATCH] Import patches-unapplied version 2.408.22 to
 ubuntu/xenial-proposed

Imported using git-ubuntu import.

Changelog parent: 09a02366158f903528da1e2c083407c75a2f7a18

New changelog entries:
  * Make sure to remove any initramfs that was generated in a minimized
    image.
  * divert /usr/bin/systemd-detect-virt as part of the grub diversions, so
    that the grub kernel postinst hook is operational when we're building
    in a container.  LP: #1729034.
---
 debian/changelog                | 10 ++++++++++
 live-build/auto/build           |  8 ++++++++
 live-build/ubuntu-cpc/functions | 13 +++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 743c746a..9fb54059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+livecd-rootfs (2.408.22) xenial; urgency=medium
+
+  * Make sure to remove any initramfs that was generated in a minimized
+    image.
+  * divert /usr/bin/systemd-detect-virt as part of the grub diversions, so
+    that the grub kernel postinst hook is operational when we're building
+    in a container.  LP: #1729034.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 21 Oct 2017 20:53:02 -0700
+
 livecd-rootfs (2.408.21) xenial; urgency=medium
 
   [ Balint Reczey ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 367e41f8..8f4b0bd5 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -158,6 +158,14 @@ EOF
 
 	lb chroot "$@"
 
+	if [ "${SUBPROJECT:-}" = minimized ]; then
+		# and if initramfs-tools was configured before our kernel,
+		# /etc/kernel/postinst.d/initramfs-tools will have created
+		# an initramfs despite the generic dpkg-divert; so remove it
+		# here.
+		rm -f chroot/boot/initrd.img-*
+	fi
+
 	if [ -f config/oem-config-preinstalled ]; then
 
 # This is cargo-culted almost verbatim (with some syntax changes for
diff --git a/live-build/ubuntu-cpc/functions b/live-build/ubuntu-cpc/functions
index 246b839f..49aa4313 100644
--- a/live-build/ubuntu-cpc/functions
+++ b/live-build/ubuntu-cpc/functions
@@ -298,6 +298,15 @@ divert_grub() {
 	chroot "$CHROOT_ROOT" dpkg-divert --local \
 		--divert /etc/grub.d/30_os-prober.dpkg-divert \
 		--rename /etc/grub.d/30_os-prober
+
+	# Divert systemd-detect-virt; /etc/kernel/postinst.d/zz-update-grub
+	# no-ops if we are in a container, and the launchpad farm runs builds
+	# in lxd.  We therefore pretend that we're never in a container (by
+	# exiting 1).
+	chroot "$CHROOT_ROOT" dpkg-divert --local \
+		--rename /usr/bin/systemd-detect-virt
+	echo "exit 1" > "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
+	chmod +x "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
 }
 
 undivert_grub() {
@@ -310,4 +319,8 @@ undivert_grub() {
 	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
 		--divert /etc/grub.d/30_os-prober.dpkg-divert \
 		--rename /etc/grub.d/30_os-prober
+
+	rm "$CHROOT_ROOT"/usr/bin/systemd-detect-virt
+	chroot "$CHROOT_ROOT" dpkg-divert --remove --local \
+		--rename /usr/bin/systemd-detect-virt
 }