From f38122e07090d8cbeecefeb562a7e8249a60d387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 23 Oct 2019 16:02:36 +0200 Subject: [PATCH] Support EXTRA_SNAPS --- debian/changelog | 4 +++- live-build/auto/config | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 048194a6..e8becac7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,7 +4,9 @@ livecd-rootfs (2.525.32) UNRELEASED; urgency=medium this series (LP: #1849343). * 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 - 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 Tue, 22 Oct 2019 17:34:31 +0200 diff --git a/live-build/auto/config b/live-build/auto/config index 8d800e4e..7862ea2c 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -204,7 +204,10 @@ case $IMAGEFORMAT in *) UBUNTU_IMAGE_ARGS="" ;; esac - + + for snap in $EXTRA_SNAPS; do + UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --extra-snaps $snap" + done echo "IMAGEFORMAT=$IMAGEFORMAT" >> 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