From 5afe03acbb5cdd2bd7a63f64d17574940ce6d298 Mon Sep 17 00:00:00 2001
From: Robert C Jennings <robert.jennings@canonical.com>
Date: Mon, 29 Jan 2018 12:15:17 -0500
Subject: [PATCH] Import patches-unapplied version 2.490 to
 ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: bdda0b17ea81979f749c9ef0101645e454bb563a

New changelog entries:
  * ubuntu-cpc: Initramfs compression should match default for
    update-initramfs (LP: #1744114)
---
 debian/changelog       | 7 +++++++
 live-build/auto/config | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 843794e2..badd9dea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.490) bionic; urgency=medium
+
+  * ubuntu-cpc: Initramfs compression should match default for
+    update-initramfs (LP: #1744114)
+
+ -- Robert C Jennings <robert.jennings@canonical.com>  Mon, 29 Jan 2018 12:15:17 -0500
+
 livecd-rootfs (2.489) bionic; urgency=medium
 
   [ Balint Reczey ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 9abaaa65..15788881 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -487,7 +487,8 @@ case $PROJECT in
 				add_package install shim-signed
 				;;
 		esac
-		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none --initramfs-compression=none"
+		OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none"
+		INITRAMFS_COMPRESSION="none"
 
 		# contains the framework definition
 		add_package install ubuntu-core-libs
@@ -583,6 +584,7 @@ case $PROJECT in
 		OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
 		OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
 		OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
+		INITRAMFS_COMPRESSION="gzip"
 		;;
 
 	*)
@@ -696,7 +698,7 @@ lb config noauto \
 	${KERNEL_FLAVOURS:+--linux-flavours "$KERNEL_FLAVOURS"} \
 	--initsystem none \
 	--bootloader "$BOOTLOADER" \
-	--initramfs-compression lzma \
+	--initramfs-compression "${INITRAMFS_COMPRESSION:-lzma}" \
 	--cache false \
 	${BOOTAPPEND_LIVE:+--bootappend-live "$BOOTAPPEND_LIVE"} \
 	$OPTS \