V8.00.000.2025.06.17

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

ciss_debian_installer.sh

@@ -229,10 +229,12 @@ uuid_logger
 ### CDI_4000
 info_echo "4000_debootstrap.sh"
 func_debootstrap
-info_echo "4005_check_usr_merge.sh"
+info_echo "4005_debootstrap_checks.sh"
-check_usr_merge
+check_debootstrap
 info_echo "4010_prepare_mounts.sh"
 prepare_mounts
+info_echo "4015_check_usr_merge.sh"
+check_usr_merge
 info_echo "4020_remove_x509.sh"
 remove_x509
 info_echo "4030_setup_hostname.sh"

func/cdi_4000_debootstrap/4005_debootstrap_checks.sh

@@ -0,0 +1,83 @@
+#!/bin/bash
+# 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
+
+guard_sourcing
+
+#######################################
+# Preliminary post debootstrap checks.
+# Globals:
+#   TARGET
+# Arguments:
+#   None
+# Returns:
+#   0: on success
+#######################################
+check_debootstrap() {
+  ### Declare Arrays, HashMaps, and Variables.
+  declare -r  var_logfile="/root/.ciss/cdi/log/4005_debootstrap_checks.log"
+
+  chroot_logger "${TARGET}${var_logfile}"
+
+  chroot_script "${TARGET}" "
+    {
+      ### Header
+      echo '==[debootstrap checks]=='
+      date -Is 2>/dev/null || true
+
+      ### dpkg audit (non-fatal)
+      echo '### dpkg --audit'
+      dpkg --audit || true
+
+      ### essential subset (status & version)
+      echo '### dpkg-query essential subset'
+      dpkg-query -W -f='\${db:Status-Abbrev} \${binary:Package} \${Version}\n' dpkg libc6 coreutils bash apt systemd 2>/dev/null || true
+
+      ### init presence (log explicit)
+      echo '### init presence'
+      if [[ -x /sbin/init ]] || [[ -x /lib/systemd/systemd ]]; then
+        echo 'init_present=yes'
+      else
+        echo 'init_present=no'
+      fi
+
+      ### awk path and alternative link (if any)
+      echo '### awk'
+      awk_path=\$(command -v awk || true)
+      printf 'awk_path=%s\n' \"\$awk_path\"
+      if [[ -L /usr/bin/awk ]]; then
+        printf 'awk_link=/usr/bin/awk -> %s\n' \"\$(readlink -f /usr/bin/awk 2>/dev/null || true)\"
+      fi
+
+      ### usr-merge / tainted check
+      echo '### usr-merge / taint'
+      usr_merge_ok=yes
+      for p in /bin /sbin /lib /lib64; do
+        [[ -e \"\$p\" ]] || continue
+        if [[ -L \"\$p\" ]]; then
+          tgt=\$(readlink -f \"\$p\" 2>/dev/null || true)
+          printf '%s -> %s\n' \"\$p\" \"\$tgt\"
+        else
+          usr_merge_ok=no
+          printf '%s is not a symlink (tainted: unmerged-bin)\n' \"\$p\"
+        fi
+      done
+      printf 'usr_merge_ok=%s\n' \"\$usr_merge_ok\"
+
+      ### architecture
+      echo '### architecture'
+      dpkg --print-architecture 2>/dev/null || true
+    } >> ${var_logfile}
+  "
+
+  guard_dir && return 0
+}
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

func/cdi_4000_debootstrap/4015_check_usr_merge.sh

@@ -13,7 +13,7 @@
 guard_sourcing
 
 #######################################
-# Check if the target system is not 'tainted: unmerged-bin'.
+# Check if the target system is not 'tainted: unmerged-usr'.
 # Globals:
 #   TARGET
 #   architecture
@@ -24,7 +24,7 @@ guard_sourcing
 #######################################
 check_usr_merge() {
   ### Declare Arrays, HashMaps, and Variables.
-  declare -r  var_logfile="/root/.ciss/cdi/log/4005_check_usr_merge.log"
+  declare -r  var_logfile="/root/.ciss/cdi/log/4015_check_usr_merge.log"
 
   chroot_logger "${TARGET}${var_logfile}"
 

meta_loader_func.sh

@@ -40,8 +40,9 @@ source_guard "./func/cdi_3200_partitioning/3295_get_label.sh"
 
 ### cdi_4000_debootstrap
 source_guard "./func/cdi_4000_debootstrap/4000_debootstrap.sh"
-source_guard "./func/cdi_4000_debootstrap/4005_check_usr_merge.sh"
+source_guard "./func/cdi_4000_debootstrap/4005_debootstrap_checks.sh"
 source_guard "./func/cdi_4000_debootstrap/4010_prepare_mounts.sh"
+source_guard "./func/cdi_4000_debootstrap/4015_check_usr_merge.sh"
 source_guard "./func/cdi_4000_debootstrap/4020_remove_x509.sh"
 source_guard "./func/cdi_4000_debootstrap/4030_setup_hostname.sh"
 source_guard "./func/cdi_4000_debootstrap/4035_setup_resolv.sh"