[neon/neon/livecd-rootfs/Neon/unstable] /: merge 24.04.76 changes

[Carlos De Maine]

Git commit 0639d23d5b13fd70fac368856436f29fa714e366 by Carlos De Maine.
Committed on 23/08/2024 at 00:28.
Pushed by carlosdem into branch 'Neon/unstable'.

merge 24.04.76 changes

M  +8    -1    debian/changelog
M  +6    -0    live-build/functions

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/0639d23d5b13fd70fac368856436f29fa714e366

diff --git a/debian/changelog b/debian/changelog
index 322e81de..9b51b416 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
+livecd-rootfs (24.04.76) noble; urgency=medium
+
+  * Force latest/stable/ubuntu-24.10 subiquity onto the ubuntu-core-installer
+    ISO for now. (LP: #2077495)
+
+ -- Michael Hudson-Doyle <michael.hudson at ubuntu.com>  Wed, 21 Aug 2024 16:13:58 +1200
+
 livecd-rootfs (24.04.75) noble; urgency=medium
 
-  * Add 'ubuntu-core-installer' project.
+  * Add 'ubuntu-core-installer' project. (LP: #2076307)
 
  -- Michael Hudson-Doyle <michael.hudson at ubuntu.com>  Tue, 30 Jul 2024 16:35:31 +1200
 
diff --git a/live-build/functions b/live-build/functions
index e7d34213..d01a2742 100644
--- a/live-build/functions
+++ b/live-build/functions
@@ -781,6 +781,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.