From fac71039c0b1cc685c4f8459db7899515214acef Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 17 Apr 2018 13:28:50 -0700 Subject: [PATCH] Import patches-unapplied version 2.408.29 to ubuntu/xenial-proposed Imported using git-ubuntu import. Changelog parent: 04fe9ce754b1fa05540f85d03a65646ee9d75c72 New changelog entries: [ Christopher Glass ] * ubuntu-cpc: When performing a minimized build make sure the /etc/cloud/build.info file says "minimal" (LP: #1759519) --- debian/changelog | 8 ++++++++ live-build/auto/build | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c8f48a01..39a2c6a1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.408.29) xenial; urgency=medium + + [ Christopher Glass ] + * ubuntu-cpc: When performing a minimized build make sure the + /etc/cloud/build.info file says "minimal" (LP: #1759519) + + -- Steve Langasek Tue, 17 Apr 2018 13:28:50 -0700 + livecd-rootfs (2.408.28) xenial; urgency=medium * ubuntu-cpc: When performing a minimized build, don't generate artifacts diff --git a/live-build/auto/build b/live-build/auto/build index 12a0aac4..0f617b56 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -305,8 +305,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