V8.00.000.2025.06.17

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

func/cdi_4100_base/4100_generate_sources.sh

@@ -94,9 +94,10 @@ generate_sources() {
 # SPDX-PackageName: CISS.debian.installer
 # SPDX-Security-Contact: security@coresecret.eu
 
-# /etc/apt/sources.list                        : Generated by CISS.debian.installer ${VAR_VERSION}
-# Architecture                                 : ${VAR_ARCHITECTURE}
-# Distribution                                 : ${VAR_CODENAME}
+# Static file system information: /etc/apt/sources.list
+# Generated by CISS.debian.installer ${VAR_VERSION}
+# Architecture: ${VAR_ARCHITECTURE}
+# Distribution: ${VAR_CODENAME}
 
 #------------------------------------------------------------------------------------------------------------------------------#
 #                                                     OFFICIAL DEBIAN REPOS                                                    #

func/cdi_4100_base/4121_installation_initramfs.sh

@@ -34,7 +34,7 @@ installation_initramfs() {
   install -D -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/initramfs-tools/modules" \
     "${TARGET}/etc/initramfs-tools/"
 
-  insert_initramfs_comments "${TARGET}/etc/initramfs-tools/modules"
+  insert_comments "${TARGET}/etc/initramfs-tools/modules"
 
   var_modules=$(grep_nic_driver_modules)
 
@@ -62,12 +62,13 @@ EOF
 # SPDX-PackageName: CISS.debian.installer
 # SPDX-Security-Contact: security@coresecret.eu
 
-# /etc/initramfs-tools/conf.d/driver-policy    : Generated by CISS.debian.installer ${VAR_VERSION}
-# Architecture                                 : ${VAR_ARCHITECTURE}
-# Distribution                                 : ${VAR_CODENAME}
+# Static file system information: /etc/initramfs-tools/conf.d/driver-policy
+# Generated by CISS.debian.installer ${VAR_VERSION}
+# Architecture: ${VAR_ARCHITECTURE}
+# Distribution: ${VAR_CODENAME}
 
 # Driver inclusion policy selected during installation.
-# Note: this setting overrides the value set in the file '/etc/initramfs-tools/initramfs.conf'.
+# Note: This setting overrides the value set in the file '/etc/initramfs-tools/initramfs.conf'.
 
 MODULES=dep
 
@@ -76,26 +77,4 @@ EOF
 
   guard_dir && return 0
 }
-
-#######################################
-# Helper to insert the Metadata field into '/etc/initramfs-tools/modules'.
-# Globals:
-#   VAR_ARCHITECTURE
-#   VAR_CODENAME
-#   VAR_VERSION
-# Arguments:
-#   1: /etc/initramfs-tools/modules
-# Returns:
-#   0: on success
-#######################################
-insert_initramfs_comments() {
-  declare file="${1}"
-  sed -i '/^# SPDX-Security-Contact: security@coresecret\.eu$/a\
-\
-# /etc/initramfs-tools/modules                 : Generated by CISS.debian.installer '"${VAR_VERSION}"'\
-# Architecture                                 : '"${VAR_ARCHITECTURE}"'\
-# Distribution                                 : '"${VAR_CODENAME}"'
-' "${file}"
-  return 0
-}
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

func/cdi_4100_base/4150_installation_chrony.sh

@@ -64,7 +64,7 @@ installation_chrony() {
 
   install -D -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/chrony/chrony.cnf" "${TARGET}/etc/chrony/chrony.conf"
 
-  insert_chrony_comments "${TARGET}/etc/chrony/chrony.conf"
+  insert_comments "${TARGET}/etc/chrony/chrony.conf"
 
   cat "${var_of}" >> "${TARGET}/etc/chrony/chrony.conf"
 
@@ -80,26 +80,4 @@ installation_chrony() {
 
   guard_dir && return 0
 }
-
-#######################################
-# Helper to insert the Metadata field into '/etc/chrony/chrony.conf'.
-# Globals:
-#   VAR_ARCHITECTURE
-#   VAR_CODENAME
-#   VAR_VERSION
-# Arguments:
-#   1: /etc/chrony/chrony.conf
-# Returns:
-#   0: on success
-#######################################
-insert_chrony_comments() {
-  declare file="${1}"
-  sed -i '/^# SPDX-Security-Contact: security@coresecret\.eu$/a\
-\
-# /etc/chrony/conf.d                           : Generated by CISS.debian.installer '"${VAR_VERSION}"'\
-# Architecture                                 : '"${VAR_ARCHITECTURE}"'\
-# Distribution                                 : '"${VAR_CODENAME}"'
-' "${file}"
-  return 0
-}
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh