diff --git a/debian/changelog b/debian/changelog index 9d751e0f..e7f415f6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.620.2) eoan; urgency=medium + + * Fix logic to ensure snapd is seeded in core18-only images (LP: #1871919) + + -- Robert C Jennings Wed, 15 Apr 2020 10:05:55 -0500 + livecd-rootfs (2.620.1) eoan; urgency=medium * Use snap cli rather than custom snap-tool (LP: #1864252) diff --git a/live-build/functions b/live-build/functions index 1113de03..279bfa8d 100644 --- a/live-build/functions +++ b/live-build/functions @@ -536,11 +536,7 @@ EOF echo -n " file: " >> $seed_yaml (cd $snaps_dir; ls -1 ${SNAP_NAME}_*.snap) >> $seed_yaml - # If $core_snap is the empty string then SNAP itself *may be* a core snap, - # and we run some post-processing logic. - if [ -z "$core_snap" ]; then - _snap_post_process $CHROOT_ROOT $SNAP_NAME - fi + _snap_post_process $CHROOT_ROOT $SNAP_NAME } snap_prepare_assertions() { @@ -619,12 +615,6 @@ snap_prepare() { local CUSTOM_BRAND_MODEL=${2:-generic:generic-classic} snap_prepare_assertions "$CHROOT_ROOT" "$CUSTOM_BRAND_MODEL" - - # ubuntu-cpc:minimized has its own special snap handling - if [ "$PROJECT:${SUBPROJECT:-}" != ubuntu-cpc:minimized ]; then - # Download the core snap - _snap_preseed "$CHROOT_ROOT" core stable - fi } snap_preseed() {