V8.00.000.2025.06.17

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

func/cdi_3200_partitioning/3200_partitioning.sh

@@ -357,8 +357,8 @@ partitioning() {
     }
   ' |
     ### c) Sort NUL-separated by the group, then lexicographically by the *full path*:
-    ### This ensures parent before child due to prefix property:
+    ###    This ensures parent before child due to prefix property:
-    ### "/boot" < "/boot/efi", "/var/log" < "/var/log/audit" < "/var/tmp"
+    ###    "/boot" < "/boot/efi", "/var/log" < "/var/log/audit" < "/var/tmp"
     sort -z -t $'\t' -k1,1 -k2,2 | cut -z -f2-
   )
 

func/cdi_4100_base/4121_installation_initramfs.sh

@@ -31,7 +31,7 @@ installation_initramfs() {
   declare     var_modules=""
 
   ### Install the script to be called by 'update-initramfs' to enforce merged-/usr symlinks inside the initramfs image.
-  install -D -m 0755 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/hooks/custom-usrmerge.sh" \
+  install -D -m 0755 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/hooks/zzzz-custom-usrmerge.sh" \
     "${TARGET}/etc/initramfs-tools/hooks/"
 
   ### Install the script to be called by 'update-initramfs' for installing the necessary modules to load into initramfs environment.

func/cdi_4100_base/4133_installation_masking.sh

@@ -28,6 +28,12 @@ installation_masking() {
 
   do_log "info" "file_only" "4133() Masked: [ctrl-alt-del.target sleep.target suspend.target hibernate.target hybrid-sleep.target]."
 
+  chroot_script "${TARGET}" "
+      systemctl mask plymouth-start.service plymouth-quit.service plymouth-quit-wait.service plymouth-read-write.service
+  "
+
+  do_log "info" "file_only" "4133() Masked: [plymouth-start.service plymouth-quit.service plymouth-quit-wait.service plymouth-read-write.service]."
+
   guard_dir && return 0
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

func/cdi_4200_boot/4200_generate_fstab.sh

@@ -28,9 +28,6 @@ guard_sourcing
 write_fstab() {
   declare write_maps="$1" write_path="$2" write_type="$3" write_opts="$4" write_pass="$5"
 
-  #if [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}$ ]] || [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$ ]]; then
-  #if [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}$ ]] || [[ "${write_maps}" =~ ^[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}$ ]] || [[ "${write_maps}" =~ ^[0-9a-fA-F]{8}-([0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}$ ]]; then
-
   if [[ "${write_maps}" == /dev/mapper/* ]]; then
 
     printf "%-43s%-28s%-18s%-100s0 %s\n" "${write_maps}" "${write_path}" "${write_type}" "${write_opts}" "${write_pass}" >> "${TARGET}/etc/fstab"

includes/target/etc/initramfs-tools/hooks/custom-usrmerge.sh

@@ -1,38 +0,0 @@
-#!/bin/sh
-# SPDX-Version: 3.0
-# SPDX-CreationInfo: 2025-06-17; WEIDNER, Marc S.; <msw@coresecret.dev>
-# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.installer.git
-# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency
-# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; <msw@coresecret.dev>
-# SPDX-FileType: SOURCE
-# SPDX-License-Identifier: EUPL-1.2 OR LicenseRef-CCLA-1.0
-# SPDX-LicenseComment: This file is part of the CISS.debian.installer.secure framework.
-# SPDX-PackageName: CISS.debian.installer
-# SPDX-Security-Contact: security@coresecret.eu
-# SPDX-Comment: Enforce merged-/usr symlinks inside the initramfs image.
-
-set -e
-
-PREREQ=""
-prereqs() { echo "${PREREQ}"; }
-case $1 in
-  prereqs) prereqs; exit 0 ;;
-esac
-
-. /usr/share/initramfs-tools/hook-functions
-
-### Ensure target directories exist in the future initramfs root.
-mkdir -p "${DESTDIR}/usr/bin" "${DESTDIR}/usr/sbin" "${DESTDIR}/usr/lib"
-
-### Create/refresh the canonical symlinks (idempotent).
-ln -sfn usr/bin  "${DESTDIR}/bin"
-ln -sfn usr/sbin "${DESTDIR}/sbin"
-ln -sfn usr/lib  "${DESTDIR}/lib"
-
-### amd64 optional:
-# shellcheck disable=2292
-[ -d "${DESTDIR}/usr/lib64" ] && ln -sfn usr/lib64 "${DESTDIR}/lib64"
-
-printf "\e[92mSuccessfully executed: [/etc/initramfs-tools/hooks/custom-usrmerge.sh] \n\e[0m"
-
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

includes/target/etc/initramfs-tools/hooks/zzzz-custom-usrmerge.sh

@@ -0,0 +1,72 @@
+#!/bin/sh
+# SPDX-Version: 3.0
+# SPDX-CreationInfo: 2025-06-17; WEIDNER, Marc S.; <msw@coresecret.dev>
+# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.installer.git
+# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency
+# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; <msw@coresecret.dev>
+# SPDX-FileType: SOURCE
+# SPDX-License-Identifier: EUPL-1.2 OR LicenseRef-CCLA-1.0
+# SPDX-LicenseComment: This file is part of the CISS.debian.installer.secure framework.
+# SPDX-PackageName: CISS.debian.installer
+# SPDX-Security-Contact: security@coresecret.eu
+# SPDX-Comment: Enforce merged-/usr symlinks inside the initramfs image.
+
+set -e
+
+PREREQ=""
+prereqs() { echo "${PREREQ}"; }
+case $1 in
+  prereqs) prereqs; exit 0 ;;
+esac
+
+. /usr/share/initramfs-tools/hook-functions
+
+### Ensure target directories exist in the future initramfs root.
+mkdir -p "${DESTDIR}/usr/bin" "${DESTDIR}/usr/sbin" "${DESTDIR}/usr/lib"
+
+### /lib64 may or may not exist depending on arch; create if present on the host system.
+# shellcheck disable=2292
+[ -d "${DESTDIR}/usr/lib64" ] || mkdir -p "${DESTDIR}/usr/lib64" 2>/dev/null || true
+
+# shellcheck disable=2292
+move_dir_into_usr() {
+  ### $1: top-level name (bin|sbin|lib|lib64)
+  ### Moves all contents of /$1 into /usr/$1 and removes /$1 if it was a directory.
+  ### Then creates a symlink /$1 -> usr/$1
+  d="$1"
+  top="${DESTDIR}/${d}"
+  usr="${DESTDIR}/usr/${d}"
+
+  if [ -L "${top}" ]; then
+    ### Already a symlink, so nothing to do.
+    return 0
+  fi
+
+  if [ -d "${top}" ]; then
+    ### Copy including dotfiles; -a preserves perms/links if available (coreutils on build host).
+    ### If 'cp -a' is unavailable, fallback to 'cp -rp'.
+    if cp -a "${top}/." "${usr}/" 2>/dev/null; then
+      :
+    else
+      cp -rp "${top}/." "${usr}/"
+    fi
+    ### Remove the original directory tree, then replace with symlink
+    rm -rf "${top}"
+  fi
+
+  ### Create (or refresh) the canonical symlink
+  ln -sfn "usr/${d}" "${top}"
+
+  return 0
+}
+
+move_dir_into_usr bin
+move_dir_into_usr sbin
+move_dir_into_usr lib
+### /lib64 exists only on some arch images; harmless if empty
+# shellcheck disable=2292
+[ -d "${DESTDIR}/usr/lib64" ] && move_dir_into_usr lib64
+
+printf "\e[92mSuccessfully executed: [/etc/initramfs-tools/hooks/zzzz-custom-usrmerge.sh] \n\e[0m"
+
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh