From cca3b21d35a46d31518f94b755233bbbf037d69b Mon Sep 17 00:00:00 2001
From: Mikhail Chusavitin <mchusavitin@mchusmbp.local>
Date: Mon, 4 May 2026 11:14:10 +0300
Subject: [PATCH] =?UTF-8?q?Revert=20squashfs=20layer=20split=20=E2=80=94?=
 =?UTF-8?q?=20live-boot=20cannot=20mount=20partial=20rootfs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

split_live_squashfs_layers moved /usr out of filesystem.squashfs into a
separate 10-usr.squashfs, leaving a rootfs skeleton that live-boot
(1:20230131+deb12u1) cannot mount: the initramfs panics with
"Can not mount /dev/loop0 ... filesystem.squashfs".

live-boot in bookworm expects a single self-contained filesystem.squashfs.
Revert to the standard single-squashfs layout and remove the dead
multi-squashfs guard in needs_full_build().

The split_live_squashfs_layers function is kept for future reference.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
---
 iso/builder/build.sh | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/iso/builder/build.sh b/iso/builder/build.sh
index 6bb2a1a..0e7ae17 100755
--- a/iso/builder/build.sh
+++ b/iso/builder/build.sh
@@ -896,11 +896,6 @@ needs_full_build() {
     [ -f "${FULL_BUILD_MARKER}" ]                                        || return 0
     [ -f "${BUILD_WORK_DIR}/binary/live/filesystem.squashfs" ]           || return 0
     [ -f "${BUILD_WORK_DIR}/live-image-amd64.hybrid.iso" ]               || return 0
-    _extra_sq=$(find "${BUILD_WORK_DIR}/binary/live" -maxdepth 1 -type f -name '*.squashfs' ! -name 'filesystem.squashfs' 2>/dev/null | head -1)
-    if [ -n "$_extra_sq" ]; then
-        echo "=== full build required: multi-squashfs live image present ==="
-        return 0
-    fi
 
     _heavy=$(find \
         "${BUILDER_DIR}/VERSIONS" \
@@ -1685,7 +1680,6 @@ run_step_sh "live-build clean" "80-lb-clean" "lb clean --all 2>&1 | tail -3"
 run_step_sh "live-build config" "81-lb-config" "lb config 2>&1 | tail -5"
 dump_memtest_debug "pre-build" "${LB_DIR}"
 run_step_sh "live-build build" "90-lb-build" "lb build 2>&1"
-split_live_squashfs_layers "${LB_DIR}"
 echo "=== enforcing canonical bootloader assets ==="
 enforce_live_build_bootloader_assets "${LB_DIR}"
 reset_live_build_stage "${LB_DIR}" "binary_checksums"