From 524c0f5c4eabf59379dfd3844f5666c0af3ea45b Mon Sep 17 00:00:00 2001
From: Michael Hudson-Doyle <michael.hudson@canonical.com>
Date: Fri, 6 Dec 2024 09:56:55 +1300
Subject: [PATCH] Refer to LB_DISTRIBUTION, not SUITE, in the ubuntu-mini-iso
 binary hook.

---
 debian/changelog                                    | 6 ++++++
 live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bf0a99f5..9daf5d69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (25.04.6) UNRELEASED; urgency=medium
+
+  * Refer to LB_DISTRIBUTION, not SUITE, in the ubuntu-mini-iso binary hook.
+
+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Fri, 06 Dec 2024 09:56:21 +1300
+
 livecd-rootfs (25.04.5) plucky; urgency=medium
 
   * Fix ubuntu-mini-iso build, by using script from debian-cd to create a
diff --git a/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary
index 64cb7f62..01940189 100755
--- a/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary
+++ b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary
@@ -23,7 +23,7 @@ EOF
 chroot chroot update-initramfs -u
 
 git clone https://git.launchpad.net/~ubuntu-cdimage/debian-cd/+git/ubuntu debian-cd
-export BASEDIR=$(readlink -f debian-cd) DIST=$SUITE
+export BASEDIR=$(readlink -f debian-cd) DIST=$LB_DISTRIBUTION
 
 cat > apt.conf <<EOF
 Dir "$(pwd)/chroot";
@@ -34,7 +34,7 @@ case $ARCH in
         mkdir -p "ubuntu-mini-iso/amd64/tree/casper"
         cp "$KERNEL" ubuntu-mini-iso/amd64/tree/casper/filesystem.kernel-generic
         cp "$INITRD" ubuntu-mini-iso/amd64/tree/casper/filesystem.initrd-generic
-        APT_CONFIG_amd64=$(pwd)/apt.conf $BASEDIR/tools/boot/$SUITE/boot-amd64 1 $(readlink -f ubuntu-mini-iso/amd64/tree)
+        APT_CONFIG_amd64=$(pwd)/apt.conf $BASEDIR/tools/boot/$LB_DISTRIBUTION/boot-amd64 1 $(readlink -f ubuntu-mini-iso/amd64/tree)
         # Overwrite the grub.cfg that debian-cd generates by default
         cat > ubuntu-mini-iso/amd64/tree/boot/grub/grub.cfg <<EOF
 menuentry "Choose an Ubuntu version to install" {