From 9441bbdfb5ff8a3e2fecd409ec27e9332e7a1221 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 20 Aug 2024 16:37:45 +1200 Subject: [PATCH] Force latest/stable/ubuntu-24.10 subiquity onto the ubuntu-core-installer ISO for now. --- debian/changelog | 7 +++++++ live-build/functions | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2fb0af7a..851a0dfc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (24.04.76) UNRELEASED; urgency=medium + + * Force latest/stable/ubuntu-24.10 subiquity onto the ubuntu-core-installer + ISO for now. (LP: #2077495) + + -- Michael Hudson-Doyle Mon, 19 Aug 2024 14:37:14 +1200 + livecd-rootfs (24.04.75) noble; urgency=medium * Add 'ubuntu-core-installer' project. (LP: #2076307) diff --git a/live-build/functions b/live-build/functions index 543bb3f2..918bd064 100644 --- a/live-build/functions +++ b/live-build/functions @@ -778,6 +778,12 @@ snap_preseed() { exit 1 fi + if [ $PROJECT = ubuntu-core-installer ] && [ $SNAP_NAME = subiquity ]; then + # The ubuntu-core-installer project requires features not yet + # present in the latest/ubuntu/stable-24.04 or stable branches. + CHANNEL=latest/ubuntu/stable-24.10 + fi + _snap_preseed $CHROOT_ROOT $SNAP $CHANNEL # Mark this image as having snapd installed explicitly.