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

Merge remote-tracking branch 'toabctl/focal-backport-optional-allow-core-snaps' into ubuntu/focal

Browse Source 
* toabctl/focal-backport-optional-allow-core-snaps:
  Update debian/changelog
  Allow to install core snap optionally
This commit is contained in:
Utkarsh Gupta 2022-03-10 14:49:13 +05:30
commit 55dad01adc
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -1,8 +1,14 @@
livecd-rootfs (2.664.41) UNRELEASED; urgency=medium livecd-rootfs (2.664.41) UNRELEASED; urgency=medium
* Split UEFI image out of `disk-image` series file into `disk-image-uefi` (LP: #1961760) [ Ivan Kapelyukhin ]
* Split UEFI image out of `disk-image` series file into
`disk-image-uefi`. (LP: #1961760)
-- Ivan Kapelyukhin <ivan.kapelyukhin@canonical.com> Thu, 03 Mar 2022 15:57:13 +0100 [ Thomas Bechtold ]
* Optionally (when ALLOW_CORE_SNAP env var is set) allow to install
core snap. Still needed by some CPC projects. (LP: #1964303)
-- Thomas Bechtold <thomas.bechtold@canonical.com> Fri, 04 Mar 2022 14:00:16 +0100
livecd-rootfs (2.664.40) focal; urgency=medium livecd-rootfs (2.664.40) focal; urgency=medium

9
live-build/functions
View File

@ -562,8 +562,13 @@ _snap_preseed() {
# If snap info does not list a base the default is 'core' # If snap info does not list a base the default is 'core'
# which is now an error to use. # which is now an error to use.
if [ -z "$core_snap" ]; then if [ -z "$core_snap" ]; then
echo "Legacy snap with no base declaration found, refusing to install 'core' snap" if [ -z "$ALLOW_CORE_SNAP" ]; then
exit 1 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 fi
_snap_preseed $CHROOT_ROOT $core_snap stable _snap_preseed $CHROOT_ROOT $core_snap stable