From 5456e4e5e65c26b5cf3d443b372718d1a97b3928 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 25 Aug 2023 11:45:11 +1200 Subject: [PATCH] Undo preseeding in reset_snapd_state. --- debian/changelog | 6 ++++++ live-build/functions | 1 + 2 files changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 4d0db9e9..870a8340 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (23.10.22) UNRELEASED; urgency=medium + + * Undo preseeding in reset_snapd_state. + + -- Michael Hudson-Doyle Fri, 25 Aug 2023 11:44:57 +1200 + livecd-rootfs (23.10.21) mantic; urgency=medium * Deduplicate the layers just before creating the squashfs, to enable diff --git a/live-build/functions b/live-build/functions index 01ea76f8..4a97e9c2 100644 --- a/live-build/functions +++ b/live-build/functions @@ -1236,6 +1236,7 @@ EOF reset_snapd_state() { rootdir="$1" + /usr/lib/snapd/snap-preseed --reset $(realpath "$rootdir") || true rm -rf "$rootdir/var/lib/snapd" setup_mountpoint "$rootdir" chroot "$rootdir" apt-get install --reinstall -y snapd