V8.13.440.2025.11.19

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

config/includes.chroot/usr/lib/live/boot/0022-ciss-overlay-tmpfs

@@ -23,7 +23,7 @@ set -eu
 
 sleep 3
 
-printf "\e[95m[INFO] Starting: [/usr/lib/live/boot/0022-ciss-overlay-tmpfs.sh] ... \n\e[0m"
+printf "\e[95m[INFO] Starting            : [/usr/lib/live/boot/0022-ciss-overlay-tmpfs.sh] \n\e[0m"
 
 ### Declare variables ----------------------------------------------------------------------------------------------------------
 OVERLAY_BASE="/run/live/overlay"

config/includes.chroot/usr/lib/live/boot/0024-ciss-crypt-squash

@@ -21,7 +21,7 @@ _SAVED_SET_OPTS="$(set +o)"
 
 set -eu
 
-printf "\e[95m[INFO] Starting: [/usr/lib/live/boot/0024-ciss-crypt-squash] ... \n\e[0m"
+printf "\e[95m[INFO] Starting            : [/usr/lib/live/boot/0024-ciss-crypt-squash] \n\e[0m"
 
 #######################################
 # Ask for a passphrase on /dev/console, mask input with '*'.

config/includes.chroot/usr/lib/live/boot/0026-ciss-early-sysctl

@@ -21,7 +21,7 @@ _SAVED_SET_OPTS="$(set +o)"
 
 set -eu
 
-printf "\e[95m[INFO] Starting: [/usr/lib/live/boot/0026-ciss-early-sysctl.sh] ... \n\e[0m"
+printf "\e[95m[INFO] Starting            : [/usr/lib/live/boot/0026-ciss-early-sysctl.sh] \n\e[0m"
 
 echo 2 > /proc/sys/kernel/yama/ptrace_scope 2>/dev/null || true
 echo 1 > /proc/sys/kernel/unprivileged_bpf_disabled 2>/dev/null || true

config/includes.chroot/usr/lib/live/boot/0030-ciss-verify-checksums

@@ -29,7 +29,7 @@
 #   0 : Successful verification
 #######################################
 Verify_checksums() {
-  printf "\e[95m[INFO] Starting: [/usr/lib/live/boot/0030-ciss-verify-checksums] ... \n\e[0m"
+  printf "\e[95m[INFO] Starting            : [/usr/lib/live/boot/0030-ciss-verify-checksums] \n\e[0m"
 
   ### Declare variables --------------------------------------------------------------------------------------------------------
 
@@ -48,6 +48,7 @@ Verify_checksums() {
   #######################################
   log_in() { printf '\e[95m[INFO]  %s \n\e[0m' "$*"; }
 
+
   #######################################
   # Helper for colored text output on stdout.
   # Globals:
@@ -153,7 +154,7 @@ Verify_checksums() {
     CDLB_CMD="/usr/bin/sha512sum"
     CDLB_SHA="sha512"
 
-    for _CAND in /scripts/live-bottom/0030-ciss-verify-checksums /usr/lib/live/boot/0030-ciss-verify-checksums; do
+    for _CAND in /scripts/live-bottom/0030-ciss-verify-checksums /usr/lib/live/boot/0030-ciss-verify-checksums ; do
 
       [ -e "${_CAND}" ] && { CDLB_SCRIPT_SELF="${_CAND}"; break; }
 
@@ -162,7 +163,7 @@ Verify_checksums() {
     CDLB_SCRIPT_FILE="${CDLB_SCRIPT_SELF##*/}"
     CDLB_SCRIPT_PATH="${CDLB_SCRIPT_SELF%/*}"
     CDLB_SCRIPT_FULL="${CDLB_SCRIPT_PATH%/}/${CDLB_SCRIPT_FILE}"
-    CDLB_HASHFILE="${CDLB_SCRIPT_FILE}.${CDLB_SHA}sum.txt"
+    CDLB_HASHFILE="/etc/ciss/hashes/${CDLB_SCRIPT_FILE}.${CDLB_SHA}sum.txt"
     CDLB_SIG_FILE="${CDLB_HASHFILE}.sig"
 
     _STATUS="$(/usr/bin/gpgv --no-default-keyring --keyring "${_KEYFILE}" --status-fd 1 --verify "${CDLB_SIG_FILE}" "${CDLB_SCRIPT_FULL}" 2>/dev/null)"

config/includes.chroot/usr/lib/live/boot/0042-ciss-post-decrypt-attest

@@ -21,7 +21,7 @@ _SAVED_SET_OPTS="$(set +o)"
 
 set -eu
 
-printf "\e[95m[INFO] Starting: [/usr/lib/live/boot/0042-ciss-post-decrypt-attest] ... \n\e[0m"
+printf "\e[95m[INFO] Starting            : [/usr/lib/live/boot/0042-ciss-post-decrypt-attest] \n\e[0m"
 
 ### Declare variables ----------------------------------------------------------------------------------------------------------
 

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

@@ -20,11 +20,11 @@
 
 # set -e
 
-printf "\e[95m[INFO] Sourcing: [/usr/lib/live/boot/9990-main.sh] ... \n\e[0m"
+printf "\e[95m[INFO] Sourcing            : [/usr/lib/live/boot/9990-main.sh] \n\e[0m"
 
 Live ()
 {
-  printf "\e[95m[INFO] Starting: [/usr/lib/live/boot/9990-main.sh] ... \n\e[0m"
+  printf "\e[95m[INFO] Starting            : [/usr/lib/live/boot/9990-main.sh] \n\e[0m"
 
   if [ -x /scripts/local-top/cryptroot ]
   then
@@ -56,12 +56,12 @@ Live ()
   # Needed here too because some things (*cough* udev *cough*)
   # change the timeout
 
-  printf "\e[93m[DEBUG] live(): Before do_netmount() pp. \e[0m\n" >&2
+  printf "\e[93m[DEBUG] live(): Before do_netmount() pp. \e[0m\n"
   if [ -n "${NETBOOT}" ] || [ -n "${FETCH}" ] || [ -n "${HTTPFS}" ] || [ -n "${FTPFS}" ]
   then
     if do_netmount
     then
-      printf "\e[93m[DEBUG] live(): [livefs_root=%s] \e[0m\n" "${mountpoint?}" >&2
+      printf "\e[93m[DEBUG] live(): [livefs_root=%s] \e[0m\n" "${mountpoint?}"
       livefs_root="${mountpoint?}"
     else
       panic "Unable to find a live file system on the network"
@@ -69,15 +69,15 @@ Live ()
   else
     if [ -n "${ISCSI_PORTAL}" ]
     then
-      printf "\e[93m[DEBUG] live(): [do_iscsi && livefs_root=%s] \e[0m\n" "${mountpoint?}" >&2
+      printf "\e[93m[DEBUG] live(): [do_iscsi && livefs_root=%s] \e[0m\n" "${mountpoint?}"
       do_iscsi && livefs_root="${mountpoint}"
     elif [ -n "${PLAIN_ROOT}" ] && [ -n "${ROOT}" ]
     then
       # Do a local boot from hd
-      printf "\e[93m[DEBUG] live(): Do a local boot from hd [livefs_root=%s] \e[0m\n" "${ROOT?}" >&2
+      printf "\e[93m[DEBUG] live(): Do a local boot from hd [livefs_root=%s] \e[0m\n" "${ROOT?}"
       livefs_root=${ROOT}
     else
-      printf "\e[93m[DEBUG] live(): [Setup_Memdisk] \e[0m\n" >&2
+      printf "\e[93m[DEBUG] live(): [Setup_Memdisk] \e[0m\n"
       Setup_Memdisk
 
       # If the live media location is given via command line and access to it
@@ -130,7 +130,7 @@ Live ()
     panic "Unable to find a medium containing a live file system"
   fi
 
-  printf "\e[93m[DEBUG] live(): Before [Verify_checksums %s] \e[0m\n" "${livefs_root}" >&2
+  printf "\e[93m[DEBUG] live(): Before [Verify_checksums %s] \e[0m\n" "${livefs_root}"
   Verify_checksums "${livefs_root}"
 
   # shellcheck disable=SC2244
@@ -166,16 +166,16 @@ Live ()
     fi
   fi
 
-  printf "\e[93m[DBG] Live(): before overlay, live_dest=%s \e[0m\n" "${live_dest:-<none>}" >&2
-  printf "\e[93m[DBG] Live(): MODULETORAMFILE=%s PLAIN_ROOT=%s \e[0m\n" "${MODULETORAMFILE}" "${PLAIN_ROOT}" >&2
+  printf "\e[93m[DBG] Live(): before overlay, live_dest=%s \e[0m\n" "${live_dest:-<none>}"
+  printf "\e[93m[DBG] Live(): MODULETORAMFILE=%s PLAIN_ROOT=%s \e[0m\n" "${MODULETORAMFILE}" "${PLAIN_ROOT}"
   if [ -n "${MODULETORAMFILE}" ] || [ -n "${PLAIN_ROOT}" ]
   then
-    printf "\e[93m[DBG] Live(): setup_unionfs livefs_root=%s rootmnt=%s \e[0m\n" "${livefs_root}" "${rootmnt?}" >&2
+    printf "\e[93m[DBG] Live(): setup_unionfs livefs_root=%s rootmnt=%s \e[0m\n" "${livefs_root}" "${rootmnt?}"
     setup_unionfs "${livefs_root}" "${rootmnt?}"
   else
     mac="$(get_mac)"
     mac="$(echo "${mac}" | sed 's/-//g')"
-    printf "\e[93m[DBG] Live(): mount_images_in_directory livefs_root=%s rootmnt=%s mac=%s \e[0m\n" "${livefs_root}" "${rootmnt}" "${mac}" >&2
+    printf "\e[93m[DBG] Live(): mount_images_in_directory livefs_root=%s rootmnt=%s mac=%s \e[0m\n" "${livefs_root}" "${rootmnt}" "${mac}"
     mount_images_in_directory "${livefs_root}" "${rootmnt}" "${mac}"
   fi
 

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

@@ -20,11 +20,11 @@
 
 #set -e
 
-printf "\e[95m[INFO] Sourcing: [/usr/lib/live/boot/9990-overlay.sh] ... \n\e[0m"
+printf "\e[95m[INFO] Sourcing            : [/usr/lib/live/boot/9990-overlay.sh] \n\e[0m"
 
 setup_unionfs ()
 {
-  printf "\e[95m[INFO] Starting: [/usr/lib/live/boot/9990-overlay.sh] ... \n\e[0m"
+  printf "\e[95m[INFO] Starting            : [/usr/lib/live/boot/9990-overlay.sh] \n\e[0m"
 
   image_directory="${1}"
   rootmnt="${2}"