diff -Nru livecd-rootfs-2.658/debian/changelog livecd-rootfs-2.659/debian/changelog --- livecd-rootfs-2.658/debian/changelog 2020-04-08 08:03:21.000000000 +0000 +++ livecd-rootfs-2.659/debian/changelog 2020-04-09 19:16:40.000000000 +0000 @@ -1,3 +1,9 @@ +livecd-rootfs (2.659) focal; urgency=medium + + * Fix logic to ensure snapd is seeded in core18-only images (LP: #1871919) + + -- Robert C Jennings Thu, 09 Apr 2020 14:16:40 -0500 + livecd-rootfs (2.658) focal; urgency=medium * Remove some deprecated raspi2 special-casing, switch the main universal diff -Nru livecd-rootfs-2.658/live-build/functions livecd-rootfs-2.659/live-build/functions --- livecd-rootfs-2.658/live-build/functions 2020-04-08 07:58:46.000000000 +0000 +++ livecd-rootfs-2.659/live-build/functions 2020-04-09 19:16:40.000000000 +0000 @@ -541,11 +541,7 @@ 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() { @@ -624,12 +620,6 @@ 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() {