From fc7271d42f5708ba8cca1db2a9a9732057af5ffe Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 14 Oct 2022 00:38:15 +0000 Subject: [PATCH] Imported 2.789 No reason for CPC update specified. --- debian/changelog | 6 ++++++ live-build/functions | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index c49e9879..0ec7bd59 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (2.789) kinetic; urgency=medium + + * re-enable snap preseed (LP: #1991011) + + -- jchittum Thu, 13 Oct 2022 12:41:23 -0500 + livecd-rootfs (2.788) kinetic; urgency=medium * riscv: Remove the default installation of the Wifi driver for the LicheeRV diff --git a/live-build/functions b/live-build/functions index 3de98575..a6fa5bf2 100644 --- a/live-build/functions +++ b/live-build/functions @@ -762,9 +762,8 @@ snap_validate_seed() { if [ -e "${CHROOT_ROOT}/var/lib/snapd/seed/seed.yaml" ]; then snap debug validate-seed "${CHROOT_ROOT}/var/lib/snapd/seed/seed.yaml" - # 2022-09-26 snap-preseed is hanging with the latest firefox snap LP: #1990884 - # /usr/lib/snapd/snap-preseed --reset $(realpath "${CHROOT_ROOT}") - # /usr/lib/snapd/snap-preseed $(realpath "${CHROOT_ROOT}") + /usr/lib/snapd/snap-preseed --reset $(realpath "${CHROOT_ROOT}") + /usr/lib/snapd/snap-preseed $(realpath "${CHROOT_ROOT}") chroot "${CHROOT_ROOT}" apparmor_parser --skip-read-cache --write-cache --skip-kernel-load --verbose -j `nproc` /etc/apparmor.d fi }