From 293ec25abaac3feccb33eb5eeeb074772575415e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 8 Oct 2024 13:08:14 +0100 Subject: [PATCH] Use cohort key for prepare-image. --- debian/changelog | 7 +++++++ live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index c97b6f01..22e30be7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (24.10.27) UNRELEASED; urgency=medium + + * Set UBUNTU_STORE_COHORT_KEY="+" to prepare-image to make sure we simply + use the latest snap versions regardless of phasing state. + + -- Łukasz 'sil2100' Zemczak Tue, 08 Oct 2024 13:06:10 +0100 + livecd-rootfs (24.10.26) oracular; urgency=medium * Use generic kernel flavor for Nezha D1 and LicheeRV Dock. diff --git a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary index 094d46c7..378e73ac 100644 --- a/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary +++ b/live-build/ubuntu/hooks/020-ubuntu-enhanced-sb.binary @@ -120,7 +120,7 @@ fi reset_snapd_state chroot -env SNAPPY_STORE_NO_CDN=1 snap prepare-image \ +env SNAPPY_STORE_NO_CDN=1 UBUNTU_STORE_COHORT_KEY="+" snap prepare-image \ --classic config/classic-model.model $channel chroot mv chroot/system-seed/systems/* chroot/system-seed/systems/enhanced-secureboot-desktop rm -rf chroot/var/lib/snapd/seed