Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-09 01:41:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor code-duplication removal.

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2022-12-16 11:13:42 +01:00
parent 4bcc0f2d52
commit c56e7aab04
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
live-build/auto/build
View File

@ -89,12 +89,13 @@ PREFIX="livecd.$PROJECT${SUBARCH:+-$SUBARCH}"
if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
# Use ubuntu-image instead of live-build # Use ubuntu-image instead of live-build
export SNAPPY_STORE_NO_CDN=1
# TODO: eventually, this should be handled by a single ubuntu-image # TODO: eventually, this should be handled by a single ubuntu-image
# call without having to do a conditional on ubuntu-core/classic. # 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 # We could already do that, but then we'd still have to do the
# compressing for the core images. # compressing for the core images.
if [ "$PROJECT" = "ubuntu-core" ]; then if [ "$PROJECT" = "ubuntu-core" ]; then
env SNAPPY_STORE_NO_CDN=1 \
ubuntu-image snap $UBUNTU_IMAGE_ARGS \ ubuntu-image snap $UBUNTU_IMAGE_ARGS \
-O output "$PREFIX".model-assertion -O output "$PREFIX".model-assertion
# XXX: currently we only have one image generated, but really # XXX: currently we only have one image generated, but really
@ -104,7 +105,6 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
xz -0 -T4 "$PREFIX".img xz -0 -T4 "$PREFIX".img
mv output/seed.manifest "$PREFIX".manifest mv output/seed.manifest "$PREFIX".manifest
else else
env SNAPPY_STORE_NO_CDN=1 \
ubuntu-image classic $UBUNTU_IMAGE_ARGS \ ubuntu-image classic $UBUNTU_IMAGE_ARGS \
-O output "$PREFIX".yaml -O output "$PREFIX".yaml
# Since the output of the ubuntu-image call can vary based on what # Since the output of the ubuntu-image call can vary based on what