From 62463f35ec59a5fa9e91511be25c2d0baf599f5ce2e5b1e0db22b8d26861302a Mon Sep 17 00:00:00 2001 From: "Marc S. Weidner" Date: Tue, 25 Nov 2025 13:45:38 +0000 Subject: [PATCH] V8.13.440.2025.11.19 Signed-off-by: Marc S. Weidner --- .../usr/lib/live/boot/9990-main.sh | 37 ++++++++++++------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/config/includes.chroot/usr/lib/live/boot/9990-main.sh b/config/includes.chroot/usr/lib/live/boot/9990-main.sh index c064932..2b5f5c1 100644 --- a/config/includes.chroot/usr/lib/live/boot/9990-main.sh +++ b/config/includes.chroot/usr/lib/live/boot/9990-main.sh @@ -109,22 +109,33 @@ Live () done unset IFS - # Scan local devices for the image - i=0 - while [ "${i}" -lt 60 ] - do - # shellcheck disable=SC2086 - livefs_root=$(find_livefs ${i}) + ### Skip autodetection, '$livefs_root' was pre-seeded by '0024-ciss-crypt-squash'. --------------------------------------- + if [ -n "${livefs_root:-}" ]; then - if [ -n "${livefs_root}" ] - then - break - fi + printf "\e[92m[INFO] live() : Using preseeded [livefs_root=%s] skipping autodetect. \e[0m\n" "${livefs_root}" + + else + + ### Scan local devices for the image. + i=0 + while [ "${i}" -lt 60 ]; do + + # shellcheck disable=SC2086 + livefs_root=$(find_livefs ${i}) + + if [ -n "${livefs_root}" ]; then + break + fi + + sleep 1 + i=$((i + 1)) + + done + + fi - sleep 1 - i=$((i + 1)) - done fi + fi printf "\e[93m[DEBUG] live(): [%s] -> livefs_root. \e[0m\n" "${livefs_root}"