From 696ae6e1eb7b90c5e1f208eea6c83ca2e4b93caf Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Wed, 8 Nov 2017 12:35:38 -0800
Subject: [PATCH] Name the manifest the way ubuntu-cdimage expects it for
 subarchs

---
 live-build/auto/build | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/live-build/auto/build b/live-build/auto/build
index 5a6d6c5b..141d8947 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -15,6 +15,9 @@ 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
 
@@ -33,7 +36,7 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 	ubuntu-image -c edge $extra_args \
 		-o livecd."$PROJECT".img livecd."$PROJECT".model-assertion
 	xz -0 -T4 livecd."$PROJECT".img
-	mv seed.manifest livecd."$PROJECT".manifest
+	mv seed.manifest "PREFIX".manifest
 	exit 0
 fi
 
@@ -456,9 +459,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"