From 34735684d5208981b2413047f67ee4c363d718d8 Mon Sep 17 00:00:00 2001 From: Thomas Bechtold Date: Fri, 4 Mar 2022 13:57:09 +0100 Subject: [PATCH] Allow to install core snap optionally Commit 245f7772bdb74 added code to abort the build if a snap wants to install "core" (the 16.04 runtime). That's great but there are still some CPC maintained image builds that use snaps based on "core". So make it possible to continue the build if the "ALLOW_CORE_SNAP" env variable is set. --- live-build/functions | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/live-build/functions b/live-build/functions index 2825687c..79cca5ef 100644 --- a/live-build/functions +++ b/live-build/functions @@ -595,8 +595,13 @@ _snap_preseed() { # If snap info does not list a base the default is 'core' # which is now an error to use. if [ -z "$core_snap" ]; then - echo "Legacy snap with no base declaration found, refusing to install 'core' snap" - exit 1 + if [ -z "$ALLOW_CORE_SNAP" ]; then + echo "Legacy snap with no base declaration found, refusing to install 'core' snap" + exit 1 + else + echo "Legacy snap with no base declaration found, but \$ALLOW_CORE_SNAP set. continue (but FIX YOUR SNAPS!)" + core_snap=${core_snap:-core} + fi fi _snap_preseed $CHROOT_ROOT $core_snap stable