From c56e7aab046919fc1fa04fe18e048dadbc77c8be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Fri, 16 Dec 2022 11:13:42 +0100 Subject: [PATCH] Minor code-duplication removal. --- live-build/auto/build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index 1466615b..0b4304fa 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -89,12 +89,13 @@ PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}" if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then # Use ubuntu-image instead of live-build + export SNAPPY_STORE_NO_CDN=1 + # TODO: eventually, this should be handled by a single ubuntu-image # call without having to do a conditional on ubuntu-core/classic. # We could already do that, but then we'd still have to do the # compressing for the core images. if [ "$PROJECT" = "ubuntu-core" ]; then - env SNAPPY_STORE_NO_CDN=1 \ ubuntu-image snap $UBUNTU_IMAGE_ARGS \ -O output "$PREFIX".model-assertion # XXX: currently we only have one image generated, but really @@ -104,7 +105,6 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then xz -0 -T4 "$PREFIX".img mv output/seed.manifest "$PREFIX".manifest else - env SNAPPY_STORE_NO_CDN=1 \ ubuntu-image classic $UBUNTU_IMAGE_ARGS \ -O output "$PREFIX".yaml # Since the output of the ubuntu-image call can vary based on what