From 97f379928961b268b5bb3201f92771b416dc90d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 13 Apr 2023 14:48:09 +0200 Subject: [PATCH] Do not reset seeds for canary. --- debian/changelog | 7 +++++++ live-build/ubuntu/hooks/020-canary-enhanced-sb.binary | 3 --- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fc8de620..c438ae21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.826) UNRELEASED; urgency=medium + + * Now that we moved the seeding for canary into further layers, a resed of + the preseeding is not required. + + -- Łukasz 'sil2100' Zemczak Thu, 13 Apr 2023 14:46:43 +0200 + livecd-rootfs (2.825) lunar; urgency=medium * For canary images, actually consider moving the seed listed snaps from diff --git a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary index 3c668b30..89060624 100644 --- a/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-canary-enhanced-sb.binary @@ -19,9 +19,6 @@ case ${SUBPROJECT:-} in ;; esac -/usr/lib/snapd/snap-preseed --reset $(realpath "chroot") -rm -rf chroot/var/lib/snapd/seed/* - # env SNAPPY_STORE_NO_CDN=1 snap known --remote model series=16 brand-id=canonical model=ubuntu-classic-2304-amd64 > config/classic-model.model cat < config/classic-model.model type: model