From f340ef54162166d0ae1942336aaa29e3ce029958 Mon Sep 17 00:00:00 2001
From: Florent 'Skia' Jacquet <skia@ubuntu.com>
Date: Wed, 8 Apr 2026 14:00:18 +0200
Subject: [PATCH] Make sure to produce a manifest for all images (LP: #2147522)

---
 debian/changelog      |  6 ++++++
 live-build/auto/build | 13 ++++++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e3a10d77..8ca687b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (26.04.29) UNRELEASED; urgency=medium
+
+  * Make sure to produce a manifest for all images (LP: #2147522)
+
+ -- Florent 'Skia' Jacquet <skia@ubuntu.com>  Wed, 08 Apr 2026 14:00:47 +0200
+
 livecd-rootfs (26.04.28) resolute; urgency=medium
 
   * Switch arm64 mirror from ports to archive. (LP: #2147101)
diff --git a/live-build/auto/build b/live-build/auto/build
index 885b1b15..b633c10b 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -559,13 +559,16 @@ fi
 # Create manifest unconditionally (needed for both ISO and non-ISO builds).
 if [ -e "binary/$INITFS/filesystem.manifest" ]; then
 	ln "binary/$INITFS/filesystem.manifest" "$PREFIX.manifest"
-	chmod 644 "$PREFIX.manifest"
-fi
-# '--initramfs none' produces different manifest names.
-if [ -e "binary/$INITFS/filesystem.packages" ]; then
+elif [ -e "binary/$INITFS/filesystem.packages" ]; then
+	# '--initramfs none' produces different manifest names.
 	ln "binary/$INITFS/filesystem.packages" "$PREFIX.manifest"
-	chmod 644 "$PREFIX.manifest"
+elif [ -n "$PASSES" ]; then
+	# For layered images, keep the manifest of the last pass
+	for _PASS in $PASSES; do
+		ln -f "${CASPER_DIR}/$_PASS.manifest.full" "$PREFIX.manifest"
+	done
 fi
+chmod 644 "$PREFIX.manifest"
 # Since snaps are now Ubuntu first-class citizen, so always try fetching the
 # list of seeded snaps into the manifest.  In case of layered images we skip
 # this step, as we assume they're doing it on their own at some earlier stage.