Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-06-09 17:11:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support EXTRA_SNAPS

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2019-10-23 16:02:36 +02:00
parent ce1b1cf815
commit f38122e070
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -4,7 +4,9 @@ livecd-rootfs (2.525.32) UNRELEASED; urgency=medium
this series (LP: #1849343). this series (LP: #1849343).
* Backport 999-ubuntu-image-customization.chroot to have a common place for * Backport 999-ubuntu-image-customization.chroot to have a common place for
our cloud-init datasource. Add some modifications on top to make sure the our cloud-init datasource. Add some modifications on top to make sure the
legacy raspi2 configuration stays the same. (LP: #1849472) legacy raspi2 configuration stays the same (LP: #1849472).
* Backport enabling of adding extra snaps to ubuntu-core images via the
EXTRA_SNAPS environment (LP: #1849491).
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 22 Oct 2019 17:34:31 +0200 -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 22 Oct 2019 17:34:31 +0200

5
live-build/auto/config
View File

@ -204,7 +204,10 @@ case $IMAGEFORMAT in
*) *)
UBUNTU_IMAGE_ARGS="" ;; UBUNTU_IMAGE_ARGS="" ;;
esac esac
for snap in $EXTRA_SNAPS; do
UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-snaps $snap"
done
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
# Store model assertion in top dir to get it picked up later as a build artifact # Store model assertion in top dir to get it picked up later as a build artifact