V8.00.000.2025.06.17

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

func/cdi_3200_partitioning/3200_partitioning.sh

@@ -70,6 +70,8 @@ partitioning() {
   declare -a  ary_devs=() ary_parts=() ary_paths_unsorted=()
 
   declare -i  i=0 var_dev_size=0 var_dev_end=0 var_sec_size=512
+  # shellcheck disable=SC2034
+  declare -g  VAR_ROOT_FS=""
 
   ### Iterate over all devices in the recipe.
   # shellcheck disable=SC2312
@@ -288,6 +290,12 @@ partitioning() {
         do_log "debug" "file_only" "3200() [HMP_FSTAB_MOUNT_FTYPE]: '${var_mount_path}' -> '${HMP_FSTAB_MOUNT_FTYPE["${var_mount_path}"]}'."
       fi
 
+      ### Gathering information for '/etc/initramfs-tools/conf.d/fsroot'-generation in 4121().
+      if [[ "${var_mount_path}" == "/" ]]; then
+        # shellcheck disable=SC2034
+        VAR_ROOT_FS="${var_fs}"
+      fi
+
     done
 
   lsblk -o NAME,START,SIZE,PHY-SEC,LOG-SEC,ALIGNMENT "/dev/${var_dev}" >| "${DIR_LOG}/${var_dev}_alignment.log"

func/cdi_4100_base/4121_installation_initramfs.sh

@@ -50,28 +50,22 @@ EOF
   ## 'most' - Add most filesystem and all hard-drive drivers.
   ## 'dep'  - Try and guess the modules to load.
 
-  cat << EOF >| "${TARGET}/etc/initramfs-tools/conf.d/driver-policy"
-# SPDX-Version: 3.0
-# SPDX-CreationInfo: ${VAR_DATE}; 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
-
-# Static file system information: /etc/initramfs-tools/conf.d/driver-policy
-# Generated by CISS.debian.installer ${VAR_VERSION}
-# Architecture: ${VAR_ARCHITECTURE}
-# Distribution: ${VAR_CODENAME}
-
+  insert_header "${TARGET}/etc/initramfs-tools/conf.d/driver-policy"
+  insert_comments "${TARGET}/etc/initramfs-tools/conf.d/driver-policy"
+  cat << EOF >> "${TARGET}/etc/initramfs-tools/conf.d/driver-policy"
 # Driver inclusion policy selected during installation.
 # Note: This setting overrides the value set in the file '/etc/initramfs-tools/initramfs.conf'.
 
 MODULES=dep
 
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
+EOF
+
+  insert_header "${TARGET}/etc/initramfs-tools/conf.d/fsroot"
+  insert_comments "${TARGET}/etc/initramfs-tools/conf.d/fsroot"
+  cat << EOF >> "${TARGET}/etc/initramfs-tools/conf.d/fsroot"
+FSTYPE=${VAR_ROOT_FS}
+
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
 EOF
 

func/cdi_4100_base/4130_installation_toolset.sh

@@ -44,8 +44,6 @@ installation_toolset() {
     [echo]="coreutils"
     [ln]="coreutils"
     [mkdir]="coreutils"
-    [cryptsetup]="cryptsetup"
-    [cryptsetup-initramfs]="cryptsetup-initramfs"
     [curl]="curl"
     [dirmngr]="dirmngr"
     [dmsetup]="dmsetup"