V8.00.000.2025.06.17

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

ciss_debian_installer.sh

@@ -13,9 +13,6 @@
 ### Contributions so far see ./docs/CREDITS.md
 
 # TODO: Update .dot files.
-# TODO: Move this command later than 4131_installation_systemd.sh
-### Set the X11 keyboard layout (for graphical environments).
-#do_in_target "${TARGET}" localectl set-x11-keymap "${locale_keyboard_xkb_keymap}"
 # TODO: Update preseed.yaml for pgp signing key AND / OR implementation of presigned unlock_wrapper.sh
 # TODO: Implement Clang Build Chain and Secure Boot PK CISS.ROOT.CA Signing Workflow
 # TODO: Update preseed.yaml for pgp signing key OR implementation of presigned unlock_wrapper.sh
@@ -263,6 +260,8 @@ echo "MAIN PROGRAM SEQUENCE: 4132_installation_machineid.sh ..."
 installation_machineid
 echo "MAIN PROGRAM SEQUENCE: 4133_installation_masking.sh ..."
 installation_masking
+echo "MAIN PROGRAM SEQUENCE: 4134_setup_locales_x11.sh ..."
+setup_locales_x11
 echo "MAIN PROGRAM SEQUENCE: 4140_installation_microcode.sh ..."
 installation_microcode
 echo "MAIN PROGRAM SEQUENCE: 4150_installation_chrony.sh ..."

func/cdi_4000_debootstrap/4050_setup_locales.sh

@@ -146,10 +146,6 @@ 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'."
 
-  # TODO: Move this command later than 4131_installation_systemd.sh
-  ### Set the X11 keyboard layout (for graphical environments).
-  #do_in_target "${TARGET}" localectl set-x11-keymap "${locale_keyboard_xkb_keymap}"
-
   guard_dir && return 0
 }
 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

func/cdi_4100_base/4134_setup_locales_x11.sh

@@ -0,0 +1,47 @@
+#!/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
+
+#######################################
+# Set the X11 keyboard layout (for graphical environments).
+# Globals:
+#   ARY_LOCALE
+#   TARGET
+#   VAR_ARCHITECTURE
+#   VAR_CODENAME
+#   VAR_VERSION
+#   locale_country
+#   locale_keyboard_xkb_keymap
+#   locale_language
+#   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_x11() {
+  do_in_target "${TARGET}" localectl set-x11-keymap "${locale_keyboard_xkb_keymap}"
+
+  guard_dir && return 0
+}
+# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

meta_loader_func.sh

@@ -47,7 +47,7 @@ source_guard "./func/cdi_4000_debootstrap/4035_setup_resolv.sh"
 source_guard "./func/cdi_4000_debootstrap/4040_setup_timezone.sh"
 source_guard "./func/cdi_4000_debootstrap/4050_setup_locales.sh"
 
-### cdi_4100_base_installation
+### cdi_4100_base
 source_guard "./func/cdi_4100_base/4100_generate_sources.sh"
 source_guard "./func/cdi_4100_base/4110_update_sources.sh"
 source_guard "./func/cdi_4100_base/4120_installation_kernel.sh"
@@ -56,10 +56,11 @@ source_guard "./func/cdi_4100_base/4130_installation_toolset.sh"
 source_guard "./func/cdi_4100_base/4131_installation_systemd.sh"
 source_guard "./func/cdi_4100_base/4132_installation_machineid.sh"
 source_guard "./func/cdi_4100_base/4133_installation_masking.sh"
+source_guard "./func/cdi_4100_base/4134_setup_locales_x11.sh"
 source_guard "./func/cdi_4100_base/4140_installation_microcode.sh"
 source_guard "./func/cdi_4100_base/4150_installation_chrony.sh"
 
-### cdi_4200_boot_installation
+### cdi_4200_boot
 source_guard "./func/cdi_4200_boot/4200_generate_fstab.sh"
 source_guard "./func/cdi_4200_boot/4205_check_fstab.sh"
 source_guard "./func/cdi_4200_boot/4210_generate_crypttab.sh"