V8.00.000.2025.06.17

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

func/cdi_4000_debootstrap/4000_debootstrap.sh

@@ -15,12 +15,13 @@ guard_sourcing
 #######################################
 # Install a minimal Debian environment using the 'debootstrap' command.
 # Globals:
+#   ERR_DEBOOTSTRAP
 #   LOG_DBS
 #   TARGET
-#   architecture
+#   VAR_ARCHITECTURE
+#   VAR_CODENAME
 #   debootstrap_includes
 #   debootstrap_mirror
-#   distribution
 # Arguments:
 #   None
 # Returns:
@@ -29,8 +30,8 @@ guard_sourcing
 #######################################
 func_debootstrap() {
   ### Declare Arrays, HashMaps, and Variables.
-  declare -r var_arch="${architecture}"
-  declare -r var_dist="${distribution}"
+  declare -r var_arch="${VAR_ARCHITECTURE}"
+  declare -r var_dist="${VAR_CODENAME}"
   declare -r var_target="${TARGET}"
   declare -r var_mirror="${debootstrap_mirror}"
   declare -r var_includes="${debootstrap_includes}"

func/cdi_4000_debootstrap/4010_prepare_mounts.sh

@@ -59,6 +59,7 @@ configure_system() {
 
   done
 
+
   for var_path in "${!HMP_SPECIAL_MOUNTS[@]}"; do
 
     IFS=" " read -r var_fs var_src var_opts <<< "${HMP_SPECIAL_MOUNTS[${var_path}]}"
@@ -81,6 +82,7 @@ configure_system() {
 
   done
 
+
   if [[ "${VAR_NEED_RUN_IN_TARGET:-false}" == "true" ]]; then
 
     mkdir -p "${TARGET}/run"
@@ -96,6 +98,7 @@ configure_system() {
 
   fi
 
+
   if ! do_in_target "${TARGET}" mkdir -p /etc/systemd/system/multi-user.target.wants; then
 
     do_log "emergency" "file_only" "4010() Command: [do_in_target ${TARGET} mkdir -p /etc/systemd/system/multi-user.target.wants] failed."

func/cdi_4000_debootstrap/4020_remove_x509.sh

@@ -22,19 +22,19 @@ guard_sourcing
 # Returns:
 #   0: on success
 #######################################
-expired_certs() {
+delete_expired_certs() {
 
-  install -m 0700 -o root -g root "${VAR_SETUP_PATH}/includes/chroot/hooks/1000_deleting_invalid_x509.sh" \
-    "${TARGET}/root/.ciss/cdi/hooks/1000_deleting_invalid_x509.sh"
+  install -m 0700 -o root -g root "${VAR_SETUP_PATH}/includes/chroot/hooks/4020_remove_x509.hooks.sh" \
+    "${TARGET}/root/.ciss/cdi/hooks/4020_remove_x509.hooks.sh"
 
 
-  if ! do_in_target_script "${TARGET}" "/root/.ciss/cdi/hooks/1000_deleting_invalid_x509.sh" "emergency"; then
+  if ! do_in_target_script "${TARGET}" "/root/.ciss/cdi/hooks/4020_remove_x509.hooks.sh" "emergency"; then
 
-    do_log "warn" "file_only" "4020() Command: [do_in_target_script ${TARGET} /root/.ciss/cdi/hooks/1000_deleting_invalid_x509.sh emergency] failed."
+    do_log "warn" "file_only" "4020() Command: [do_in_target_script ${TARGET} /root/.ciss/cdi/hooks/4020_remove_x509.hooks.sh emergency] failed."
 
   else
 
-    do_log "debug" "file_only" "4020() Command: [do_in_target_script ${TARGET} /root/.ciss/cdi/hooks/1000_deleting_invalid_x509.sh emergency] successful."
+    do_log "debug" "file_only" "4020() Command: [do_in_target_script ${TARGET} /root/.ciss/cdi/hooks/4020_remove_x509.hooks.sh emergency] successful."
 
   fi
 

func/cdi_4000_debootstrap/4050_setup_locales.sh

@@ -13,20 +13,35 @@
 guard_sourcing
 
 #######################################
-# Set locale and configure keyboard layout.
+# Set locale, locale overrides and configure keyboard layout.
 # Globals:
 #   TARGET
+#   VAR_ARCHITECTURE
+#   VAR_CODENAME
+#   VAR_VERSION
 #   locale_country
-#   locale_keyboard_layout
 #   locale_keyboard_xkb_keymap
 #   locale_language
 #   locale_locale
+#   locale_override_address
+#   locale_override_collate
+#   locale_override_ctype
+#   locale_override_measurement
+#   locale_override_messages
+#   locale_override_monetary
+#   locale_override_name
+#   locale_override_numeric
+#   locale_override_paper
+#   locale_override_telephone
+#   locale_override_time
 # Arguments:
 #   None
 # Returns:
 #   0: on success
 #######################################
 setup_locales() {
+  ### Declare Arrays, HashMaps, and Variables.
+  declare     var_locale_hook="${TARGET}/root/.ciss/cdi/hooks/4050_setup_locales.hooks.sh"
 
   ### Give priority to '${locale_locale}' over separately configured variables '${locale_country}' and '${locale_language}'.
   ### If 'locale_locale' is not set, build it from 'locale_language' and 'locale_country'.
@@ -34,20 +49,80 @@ setup_locales() {
     declare locale_locale="${locale_language}_${locale_country}.UTF-8"
   fi
 
-  [[ -n "${locale_locale:-}" ]] || do_log "error" "file_only" "4050() Variable '${locale_locale}' is not set."
+  ### Creat Hook in target.
+  cat << EOF >| "${var_locale_hook}"
+#!/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
 
-  ### Generate the specified locale
-  do_in_target "${TARGET}" locale-gen "${locale_locale}"
+set -Ceuo pipefail
 
-  ### Set the standard locale.
-  #do_in_target "${TARGET}" update-locale LANG="${locale_locale}" LC_ALL="${locale_locale}"
-  echo -e "LANG=${locale_locale}\nLC_ALL=${locale_locale}" >| "${TARGET}/etc/default/locale"
-  do_in_target "${TARGET}" locale-gen "${locale_locale}"
+sed -i '/^[[:space:]]*[^#[:space:]]/s/^/#/' /etc/locale.gen
+
+echo '${locale_locale} UTF-8' >> /etc/locale.gen
+
+dpkg-reconfigure -f noninteractive locales
+
+locale-gen
+
+update-locale \
+  LANG=${locale_locale} \
+  LC_ADDRESS=${locale_override_address:-${locale_locale}} \
+  LC_COLLATE=${locale_override_collate:-${locale_locale}} \
+  LC_CTYPE=${locale_override_ctype:-${locale_locale}} \
+  LC_MEASUREMENT=${locale_override_measurement:-${locale_locale}} \
+  LC_MESSAGES=${locale_override_messages:-${locale_locale}} \
+  LC_MONETARY=${locale_override_monetary:-${locale_locale}} \
+  LC_NAME=${locale_override_name:-${locale_locale}} \
+  LC_NUMERIC=${locale_override_numeric:-${locale_locale}} \
+  LC_PAPER=${locale_override_paper:-${locale_locale}} \
+  LC_TELEPHONE=${locale_override_telephone:-${locale_locale}} \
+  LC_TIME=${locale_override_time:-${locale_locale}} \
+  LC_IDENTIFICATION=${locale_locale} \
+  LC_ALL=
+EOF
+
+  chmod 0700 "${var_locale_hook}"
+  do_in_target "${TARGET}" "${var_locale_hook}"
 
   ### Set the keyboard layout for the system (for consoles).
-  [[ -e "${TARGET}/etc/default/keyboard" ]] || touch "${TARGET}/etc/default/keyboard"
-  sed -i "s/^KEYMAP=.*/KEYMAP=${locale_keyboard_layout}/" "${TARGET}/etc/default/keyboard"
-  do_log "info" "file_only" "4110() Keyboard layout updated: 'KEYMAP=${locale_keyboard_layout}' -> '${TARGET}/etc/default/keyboard'."
+  cat << EOF >| "${TARGET}/etc/default/keyboard"
+# 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
+
+# /etc/default/keyboard : Generated by CISS.debian.installer ${VAR_VERSION}
+# Architecture          : ${VAR_ARCHITECTURE}
+# Distribution          : ${VAR_CODENAME}
+
+# KEYBOARD CONFIGURATION FILE
+# Consult the keyboard(5) manual page.
+
+XKBMODEL="pc105"
+XKBLAYOUT="${locale_keyboard_xkb_keymap}"
+XKBVARIANT=""
+XKBOPTIONS=""
+BACKSPACE="guess"
+
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf
+EOF
+  chmod 0644 "${TARGET}/etc/default/keyboard"
+  do_log "info" "file_only" "4050() Keyboard layout updated: 'XKBLAYOUT=${locale_keyboard_xkb_keymap}' -> '${TARGET}/etc/default/keyboard'."
 
   ### Set the X11 keyboard layout (for graphical environments).
   do_in_target "${TARGET}" localectl set-x11-keymap "${locale_keyboard_xkb_keymap}"