V8.13.440.2025.11.19

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>

config/includes.chroot/usr/lib/live/boot/9990-overlay.sh

@@ -22,25 +22,33 @@
 
 setup_unionfs ()
 {
+  printf "\e[95m[INFO] Starting: [/usr/lib/live/boot/9990-overlay.sh] ... \n\e[0m"
+
   image_directory="${1}"
   rootmnt="${2}"
   addimage_directory="${3}"
 
-  # --- CISS hook: allow explicit root override --------------------------------------------------------------------------------
-  if [ -n "${CISS_ROOT_DEV}" ]; then
+  ### CISS hook: allow explicit root override ----------------------------------------------------------------------------------
+  if [ -z "${CISS_ROOT_DEV:-}" ] && [ -r /run/ciss-rootdev ]; then
 
-    ### Treat a block device as a plain root.
+    CISS_ROOT_DEV=$(cat /run/ciss-rootdev 2>/dev/null || printf '')
+
+  fi
+
+  if [ -n "${CISS_ROOT_DEV:-}" ]; then
+
+    ### Treat the decrypted block device as plain root (e.g., squashfs on LUKS).
     PLAIN_ROOT=1
     image_directory="${CISS_ROOT_DEV}"
 
-  elif [ -n "${CISS_ROOT_DIR}" ]; then
+  elif [ -n "${CISS_ROOT_DIR:-}" ]; then
 
-    ### Treat a directory as a plain root.
+    ### Alternative: explicitly provided root directory.
     PLAIN_ROOT=1
     image_directory="${CISS_ROOT_DIR}"
 
   fi
-  # ----------------------------------------------------------------------------------------------------------------------------
+  ### --------------------------------------------------------------------------------------------------------------------------
 
   # shellcheck disable=SC2086
   modprobe -q -b ${UNIONTYPE}
@@ -484,4 +492,6 @@ setup_unionfs ()
       fi
     done
   fi
+
+  printf "\e[92m[INFO] Successfully applied: [/usr/lib/live/boot/9990-overlay.sh] ... \n\e[0m"
 }