From 762536b5bf41caf1dec297edfc63b911efecd1b7 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 6 Feb 2018 23:37:28 -0500 Subject: [PATCH] live-build/auto/config: Take into account SUBPROJECT when setting seeded snaps, and also make sure we can work with snaps seeded in project hooks. --- debian/changelog | 7 +++++++ live-build/auto/config | 12 +++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index f9d22bb6..7844ad87 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.499) UNRELEASED; urgency=medium + + * live-build/auto/config: Take into account SUBPROJECT when setting seeded + snaps, and also make sure we can work with snaps seeded in project hooks. + + -- Mathieu Trudel-Lapierre Tue, 06 Feb 2018 22:47:05 -0500 + livecd-rootfs (2.498) bionic; urgency=medium * Don't write config/seeded-snaps if no snaps have been seeded. diff --git a/live-build/auto/config b/live-build/auto/config index 1e990087..a8f4d54a 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -655,10 +655,16 @@ esac # we'll expand the base seed given here according to the STRUCTURE file, and # then look in all of the seeds found to see which snaps are seeded -case $PROJECT in - ubuntu|kubuntu*|lubuntu*|xubuntu*|ubuntu-mate*|ubuntustudio*|ubuntukylin*|ubuntu-budgie*) +case $PROJECT:${SUBPROJECT:-} in + ubuntu:*|kubuntu*:*|lubuntu*:*|xubuntu*:*|ubuntu-mate*:*|ubuntustudio*:*|ubuntukylin*:*|ubuntu-budgie*:*) BASE_SEED='desktop' ;; + ubuntu-server:live) + BASE_SEED='server' + # subiquity is seeded but in a separate squashfs via hooks; set HOOK_SNAPS and ALL_SNAPS. + HOOK_SNAPS='subiquity' + ALL_SNAPS='' + ;; esac if [ -n "${BASE_SEED}" ]; then @@ -676,7 +682,7 @@ if [ -n "${BASE_SEED}" ]; then ALL_SNAPS="${ALL_SNAPS:+${ALL_SNAPS} }${snap}" done done - if [ -n "${ALL_SNAPS}" ]; then + if [ -n "${ALL_SNAPS}" ] || [ -n "${HOOK_SNAPS}" ]; then echo "${ALL_SNAPS}" > config/seeded-snaps fi fi