[neon/neon/livecd-rootfs/Neon/release] live-build: Allow to install core snap optionally

[Thomas Bechtold]

Git commit edc244249a6f264c606e61f804bf6c49a7f7ee55 by Thomas Bechtold.
Committed on 09/03/2022 at 09:48.
Pushed by jriddell into branch 'Neon/release'.

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.

(cherry picked from commit 34735684d5208981b2413047f67ee4c363d718d8)

M  +7    -2    live-build/functions

https://invent.kde.org/neon/neon/livecd-rootfs/commit/edc244249a6f264c606e61f804bf6c49a7f7ee55

diff --git a/live-build/functions b/live-build/functions
index d452d991..675fd819 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -562,8 +562,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