V8.00.000.2025.06.17

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

func/cdi_4600_packages/4600_installation_packages.sh

@@ -13,7 +13,7 @@
 guard_sourcing
 
 #######################################
-# Installs the desired packages.
+# Install Debian Packages as specified in 'preseed.yaml'.
 # Globals:
 #   ARY_PACKAGES
 #   TARGET

func/cdi_4600_packages/4620_installation_verification.sh

@@ -16,6 +16,7 @@ guard_sourcing
 
 #######################################
 # Installs 'aide', 'audit', and 'debsums' audit and logging packages.
+# Finalizes 'rkhunter' baseline.
 # Globals:
 #   TARGET
 #   VAR_SEC_FW

func/cdi_4700_verification/4699_check_usr_merge.sh

@@ -1,49 +0,0 @@
-#!/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
-
-#######################################
-# Check if the target system is not 'tainted: unmerged-bin'.
-# Globals:
-#   TARGET
-#   architecture
-# Arguments:
-#   None
-# Returns:
-#   0: on success
-#######################################
-check_final_usr_merge() {
-  ### Declare Arrays, HashMaps, and Variables.
-  declare -r  var_logfile="/root/.ciss/cdi/log/4699_check_usr_merge.log"
-
-  chroot_logger "${TARGET}${var_logfile}"
-
-  # shellcheck disable=SC2312
-  chroot_script "${TARGET}" "
-    test -L /bin  && test $(readlink -f /bin)  = '/usr/bin'  || echo 'UNMERGED:/bin'  | tee -a ${var_logfile}
-    test -L /sbin && test $(readlink -f /sbin) = '/usr/sbin' || echo 'UNMERGED:/sbin' | tee -a ${var_logfile}
-    test -L /lib  && test $(readlink -f /lib)  = '/usr/lib'  || echo 'UNMERGED:/lib'  | tee -a ${var_logfile}
-    echo ExitCode: \$? >> ${var_logfile}
-  "
-
-  if [[ "${architecture}" == "amd64" ]]; then
-    # shellcheck disable=SC2312
-    chroot_script "${TARGET}" "
-      test -L /lib64 && test $(readlink -f /lib64) = '/usr/lib64' || echo 'UNMERGED:/lib64' | tee -a ${var_logfile}
-      echo ExitCode: \$? >> ${var_logfile}
-    "
-  fi
-
-  guard_dir && return 0
-}
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

func/cdi_4700_xtended/4700_setup_packages.sh

@@ -1,36 +0,0 @@
-#!/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
-
-#######################################
-# Install Debian Packages as specified in 'preseed.yaml'.
-# Globals:
-#   ARY_PACKAGES
-#   TARGET
-# Arguments:
-#   None
-# Returns:
-#   0: on success
-#######################################
-setup_packages() {
-  chroot_script "${TARGET}" "apt-get update -y > /dev/null"
-
-  declare var_install_candidate=""
-
-  for var_install_candidate in "${ARY_PACKAGES[@]}"; do
-    chroot_exec "${TARGET}" apt-get install -y "${var_install_candidate}"
-  done
-
-  guard_dir && return 0
-}
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

meta_loader_func.sh

@@ -113,7 +113,6 @@ source_guard "./func/cdi_4600_packages/4620_installation_verification.sh"
 #source_guard "./func/cdi_4600_verification/4690_check_grub_cmdline.sh"
 
 ### cdi_4700_xtended
-source_guard "./func/cdi_4700_xtended/4700_setup_packages.sh"
 source_guard "./func/cdi_4700_xtended/4799_exiting_chroot_system.sh"
 
 ### cdi_5000_recovery