From b3e90b47980c38b3a4b9af6abd8eb2fcef9a4953 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue, 27 Mar 2018 12:12:31 -0700
Subject: [PATCH] Import patches-unapplied version 2.516 to
 ubuntu/bionic-proposed

Imported using git-ubuntu import.

Changelog parent: 29bf8e0b85fc599405081093a820fd00b652d421

New changelog entries:
  [ Chris Glass ]
  * Make sure we call the build "minimal" within the cloud build info,
    when building a minimized image.
---
 debian/changelog      | 8 ++++++++
 live-build/auto/build | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8d632ba8..4ca89443 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+livecd-rootfs (2.516) bionic; urgency=medium
+
+  [ Chris Glass ]
+  * Make sure we call the build "minimal" within the cloud build info,
+    when building a minimized image.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 27 Mar 2018 12:12:31 -0700
+
 livecd-rootfs (2.515) bionic; urgency=medium
 
   * Set the default locale to C.UTF-8 in all server and cloud images.
diff --git a/live-build/auto/build b/live-build/auto/build
index 9343208d..22863f8e 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -419,8 +419,13 @@ deb file:/var/lib/preinstalled-pool/ $LB_DISTRIBUTION $LB_PARENT_ARCHIVE_AREAS
 		fi
 	fi
 	if [ "$PROJECT" = "ubuntu-cpc" ]; then
+		if [ "${SUBPROJECT:-}" = minimized ]; then
+			BUILD_NAME=minimal
+		else
+			BUILD_NAME=server
+		fi
 		cat > chroot/etc/cloud/build.info << EOF
-build_name: server
+build_name: $BUILD_NAME
 serial: $BUILDSTAMP
 EOF
 	fi