From 0b2239c0695912a32c5a4122a56889ead15fb9e6 Mon Sep 17 00:00:00 2001 From: Christopher Glass Date: Thu, 22 Mar 2018 10:24:44 +0100 Subject: [PATCH 1/2] Parametrize BUILD_NAME in /etc/cloud/build.info to make it "minimal-aware". --- live-build/auto/build | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/live-build/auto/build b/live-build/auto/build index e28e6ca7..b553c74b 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -409,8 +409,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 From 51c663a8920326a4d27c26df791722dad137c9f7 Mon Sep 17 00:00:00 2001 From: Christopher Glass Date: Tue, 27 Mar 2018 16:09:35 +0200 Subject: [PATCH 2/2] Fixed whitespace/tabs. --- live-build/auto/build | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index b553c74b..e9352ead 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -409,11 +409,11 @@ 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 + if [ "${SUBPROJECT:-}" = minimized ]; then + BUILD_NAME=minimal + else + BUILD_NAME=server + fi cat > chroot/etc/cloud/build.info << EOF build_name: $BUILD_NAME serial: $BUILDSTAMP