From c4cfbef1ee75ffa46af351f74751a032fbf1ef6d Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Thu, 9 Nov 2017 23:29:50 -0800
Subject: [PATCH] Import patches-unapplied version 2.481 to
 ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 184c0e088485431a73f365347fbeee54616b00a1

New changelog entries:
  * The target for x86 ubuntu-core images is VMs, so create them with
    a buffer of free space in order to work if booted in place.
  * ubuntu-image now produces a manifest file listing the snap revisions
    used; publish this so that it's picked up by launchpad-buildd.
  * Change ubuntu-core image builds to use the standard "$PREFIX" naming for
    artifacts instead of being gratuitously different; requires a matching
    change to ubuntu-cdimage.
---
 debian/changelog       | 12 ++++++++++++
 live-build/auto/build  | 14 ++++++++------
 live-build/auto/config | 11 ++++++++++-
 3 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c92eb540..5e0a710e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+livecd-rootfs (2.481) bionic; urgency=medium
+
+  * The target for x86 ubuntu-core images is VMs, so create them with
+    a buffer of free space in order to work if booted in place.
+  * ubuntu-image now produces a manifest file listing the snap revisions
+    used; publish this so that it's picked up by launchpad-buildd.
+  * Change ubuntu-core image builds to use the standard "$PREFIX" naming for
+    artifacts instead of being gratuitously different; requires a matching
+    change to ubuntu-cdimage.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Thu, 09 Nov 2017 23:29:50 -0800
+
 livecd-rootfs (2.480) bionic; urgency=medium
 
   [ Gary Wang ]
diff --git a/live-build/auto/build b/live-build/auto/build
index e2d9359e..7c263336 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -15,12 +15,17 @@ if [ -z "${PROJECT:-}" ]; then
     exit 1
 fi
 
+# Link output files somewhere BuildLiveCD will be able to find them.
+PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
+
 if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 	# Use ubuntu-image instead of live-build
+
 	env SNAPPY_STORE_NO_CDN=1 \
-	ubuntu-image -c edge \
-		-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion
-	xz -0 -T4 livecd."$PROJECT".img
+	ubuntu-image -c edge $UBUNTU_IMAGE_ARGS \
+		-o "$PREFIX".img "$PREFIX".model-assertion
+	xz -0 -T4 "$PREFIX".img
+	mv seed.manifest "$PREFIX".manifest
 	exit 0
 fi
 
@@ -443,9 +448,6 @@ else
 	exit 1
 fi
 
-# Link output files somewhere BuildLiveCD will be able to find them.
-PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
-
 case $LB_INITRAMFS in
 	casper)
 		INITFS="casper"
diff --git a/live-build/auto/config b/live-build/auto/config
index 092f7d07..71ce31c0 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -90,6 +90,7 @@ LIVE_TASK=
 PREINSTALLED=false
 PREINSTALL_POOL=
 PREINSTALL_POOL_SEEDS=
+PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
 
 CHROOT_HOOKS=
 BINARY_HOOKS=
@@ -171,9 +172,17 @@ case $IMAGEFORMAT in
 				exit 1
 				;;
 		esac
+		case $MODEL in
+			pc-amd64|pc-i386)
+				UBUNTU_IMAGE_ARGS="--image-size 3700M" ;;
+			*)
+				UBUNTU_IMAGE_ARGS="" ;;
+		esac
+
 		echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
+		echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 		# Store model assertion in top dir to get it picked up later as a build artifact
-		env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > livecd."$PROJECT".model-assertion
+		env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 model="$MODEL" brand-id=canonical > "$PREFIX".model-assertion
 		echo "Configured ubuntu-image for the following model assertion:"
 		cat livecd."$PROJECT".model-assertion
 		echo "----------------------------------------------------------"