From 279b9473d8276fc0490267b328af770e020d4d9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Thu, 23 Mar 2023 10:57:26 +0100
Subject: [PATCH] Add zstd dep for mini-iso + minor fixes to get it building on
 livefs builders.

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

diff --git a/debian/changelog b/debian/changelog
index 1fce58fd..47d862f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+livecd-rootfs (2.815) UNRELEASED; urgency=medium
+
+  [ Dan Bungert ]
+  * debian/control: depend on zstd to test unmkinitramfs failure.
+
+  [ Łukasz 'sil2100' Zemczak ]
+  * Change the mini-iso livefs artifact name from .mini-iso.iso to .iso to be
+    more compatible with existing cdimage machinery.
+  * Rename variables accessed in the mini-iso to the equivalents exported to
+    binary hooks.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Thu, 23 Mar 2023 10:43:29 +0100
+
 livecd-rootfs (2.814) lunar; urgency=medium
 
   * Adjust journald settings for live-server for compatibility with Subiquity.
diff --git a/debian/control b/debian/control
index e784364a..438239e0 100644
--- a/debian/control
+++ b/debian/control
@@ -42,7 +42,8 @@ Depends: ${misc:Depends},
          python3-vmdkstream [amd64 i386],
          xorriso [!i386],
          xz-utils,
-         zerofree
+         zerofree,
+         zstd
 Breaks: ubuntu-defaults-builder (<< 0.32)
 Description: construction script for the livecd rootfs
  livecd-rootfs provides the script used to create the root filesystem
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 6e857f9c..b5d4b082 100755
--- a/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary
+++ b/live-build/ubuntu-mini-iso/hooks/01-mini-iso.binary
@@ -10,6 +10,8 @@ case $ARCH in
         ;;
 esac
 
+. config/binary
+
 KERNEL=chroot/boot/vmlinuz
 INITRD=chroot/boot/initrd.img
 
@@ -60,14 +62,14 @@ cat > ubuntu-mini-iso/$ARCH/tree/.disk/cd_type <<EOF
 full_cd/single
 EOF
 
-version=$(distro-info --fullname --series=$SUITE \
+version=$(distro-info --fullname --series=$LB_DISTRIBUTION \
           | sed s'/^Ubuntu/ubuntu-mini-iso/')
 
 cat > ubuntu-mini-iso/$ARCH/tree/.disk/info <<EOF
-$version - $ARCH ($NOW)
+$version - $ARCH ($BUILDSTAMP)
 EOF
 
-dest="${PWD}/livecd.${PROJECT}.ubuntu-mini.iso"
+dest="${PWD}/livecd.${PROJECT}.iso"
 xorriso="$(cat chroot/usr/share/cd-boot-images-amd64/xorriso-cmd.txt)"
 
 cd ubuntu-mini-iso/$ARCH