V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
2025-07-31 23:04:30 +02:00
parent 930f47f827
commit 45ff672479
103 changed files with 1011 additions and 266 deletions
--- a/func/system/4000_debootstrap.sh
+++ b/func/system/4000_debootstrap.sh
@@ -1,37 +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 minimal Debian environment via 'debootstrap' command.
-# Globals:
-#   TARGET
-#   architecture
-#   distribution
-# Arguments:
-#   None
-# Returns:
-#   ERR_DEBOOTSTRAP
-#   0: on success
-#######################################
-func_debootstrap() {
-  # shellcheck disable=SC2312
-  if debootstrap --arch="${architecture}" "${distribution}" "${TARGET}" https://deb.debian.org/debian | tee "${LOG_DBS}"; then
-    do_log "info" "file_only" "4000() [debootstrap --arch=${architecture} ${distribution} '${TARGET}' https://deb.debian.org/debian] successful."
-    return 0
-  else
-    do_log "emergency" "file_only" "4000() [debootstrap --arch=${architecture} ${distribution} '${TARGET}' https://deb.debian.org/debian] failed."
-    return "${ERR_DEBOOTSTRAP}"
-  fi
-}
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
--- a/func/system/4020_configure_system.sh
+++ b/func/system/4020_configure_system.sh
@@ -1,114 +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
-
-#######################################
-# Configure target system for chroot.
-# Globals:
-#   ERR_CHRT_MOUNTS
-#   TARGET
-#   VAR_CHROOT_ACTIVATED
-#   VAR_NEED_RUN_IN_TARGET
-# Arguments:
-#   None
-# Returns:
-#   ERR_CHRT_MOUNTS
-#   0: on success
-#######################################
-configure_system() {
-
-  ### Notes
-  # This file mounts all necessary pseudo filesystems into the target root environment to enable chroot operations.
-  # --rbind: recursive binding.
-  # --make-rslave: In this case, the mount point is marked as 'slave'.
-  # This means changes to the source mount (e.g., /proc) are propagated to the target mount (e.g., "${TARGET}/proc").
-  # Conversely, changes to the target mount are not propagated back to the source mount.
-  # This mode is necessary to avoid problems with double or erroneous propagation effects in chroot or container environments.
-  #
-  # Some subdirectories (such as /dev/pts, /dev/shm, /sys/fs/cgroup) are remounted with more restrictive options
-  # like 'noexec', 'nosuid', and 'nodev' to enhance security. This ensures they override the inherited bind-mounts and
-  # enforce proper runtime behavior in the chroot.
-
-  ### Declare Arrays, HashMaps, and Variables.
-  declare -A  HMP_SPECIAL_MOUNTS=(
-    ["/dev"]="devtmpfs devtmpfs mode=0755,nosuid"                        # Base device node FS
-    ["/dev/pts"]="devpts devpts noexec,nosuid"                           # Pseudoterminals
-    ["/dev/shm"]="tmpfs tmpfs rw,nosuid,nodev"                           # Shared memory
-    ["/dev/mqueue"]="mqueue mqueue rw,nosuid,nodev,noexec"               # POSIX message queues
-    ["/dev/hugepages"]="hugetlbfs hugetlbfs rw,nosuid,nodev"             # Huge pages
-    ["/proc"]="proc proc nosuid,noexec,nodev"                            # procfs
-    ["/sys"]="sysfs sysfs nosuid,noexec,nodev"                           # sysfs
-    ["/sys/fs/cgroup"]="cgroup2 cgroup2 rw,nosuid,nodev,noexec,relatime" # Unified cgroup2
-  )
-
-  declare     var_path="" var_fs="" var_src="" var_opts=""
-
-  for var_path in "${!HMP_SPECIAL_MOUNTS[@]}"; do
-
-    mkdir -p "${TARGET}${var_path}"
-
-  done
-
-  for var_path in "${!HMP_SPECIAL_MOUNTS[@]}"; do
-
-    IFS=" " read -r var_fs var_src var_opts <<< "${HMP_SPECIAL_MOUNTS[${var_path}]}"
-
-    if mountpoint -q "${TARGET}${var_path}"; then
-
-      do_log "info" "file_only" "4020() Skipped: '${TARGET}${var_path}' is already a mountpoint."
-      continue
-
-    fi
-
-    if ! mount -t "${var_fs}" "${var_src}" "${TARGET}${var_path}" -o "${var_opts}"; then
-
-      do_log "emergency" "file_only" "4020() Command: [mount -t ${var_fs} ${var_src} ${TARGET}${var_path} -o ${var_opts}] failed."
-      return "${ERR_CHRT_MOUNTS}"
-
-    fi
-
-    do_log "info" "file_only" "4020() Command: [mount -t ${var_fs} ${var_src} ${TARGET}${var_path} -o ${var_opts}] successful."
-
-  done
-
-  if [[ "${VAR_NEED_RUN_IN_TARGET:-false}" == "true" ]]; then
-
-    mkdir -p "${TARGET}/run"
-
-    if ! mount --make-rslave --rbind /run "${TARGET}/run"; then
-
-      do_log "emergency" "file_only" "4020() Command: [mount --make-rslave --rbind /run ${TARGET}/run] failed."
-      return "${ERR_CHRT_MOUNTS}"
-
-    fi
-
-    do_log "info" "file_only" "4020() Command: [mount --make-rslave --rbind /run ${TARGET}/run] successful."
-
-  fi
-
-  if ! do_in_target "${TARGET}" mkdir -p /etc/systemd/system/multi-user.target.wants; then
-
-    do_log "emergency" "file_only" "4020() Command: [do_in_target ${TARGET} mkdir -p /etc/systemd/system/multi-user.target.wants] failed."
-    return "${ERR_CHRT_MOUNTS}"
-
-  fi
-
-  do_log "info" "file_only" "4020() Command: [do_in_target ${TARGET} mkdir -p /etc/systemd/system/multi-user.target.wants] successful."
-
-  # shellcheck disable=SC2034
-  declare -gx VAR_CHROOT_ACTIVATED="system"
-  do_log "info" "file_only" "4020() Command: [declare -gx VAR_CHROOT_ACTIVATED=system]"
-
-  return 0
-}
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
--- a/func/system/4095_setup_skel.sh
+++ b/func/system/4095_setup_skel.sh
@@ -25,11 +25,11 @@ guard_sourcing
 setup_skel() {
  mkdir -p "${TARGET}/etc/skel/.ciss"

-  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/etc/skel/.bashrc" "${TARGET}/etc/skel/.bashrc"
-  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/etc/skel/.zshrc" "${TARGET}/etc/skel/.zshrc"
-  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/root/.ciss/alias" "${TARGET}/etc/skel/.ciss/alias"
-  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/root/.ciss/clean_logout.sh" "${TARGET}/etc/skel/.ciss/clean_logout.sh"
-  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/root/.ciss/shortcuts" "${TARGET}/etc/skel/.ciss/shortcuts"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.bashrc" "${TARGET}/etc/skel/.bashrc"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/target/etc/skel/.zshrc" "${TARGET}/etc/skel/.zshrc"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/target/root/.ciss/alias" "${TARGET}/etc/skel/.ciss/alias"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/target/root/.ciss/clean_logout.sh" "${TARGET}/etc/skel/.ciss/clean_logout.sh"
+  install -m 0644 -o root -g root "${VAR_SETUP_PATH}/includes/target/root/.ciss/shortcuts" "${TARGET}/etc/skel/.ciss/shortcuts"

  ### In order to be able to copy/paste from vim, one needs to create a '.vimrc' in every home directory with the following content:
  echo 'set clipboard=unnamed' >| "${TARGET}/etc/skel/.vimrc"
--- a/func/system/4100_setup_timezone.sh
+++ b/func/system/4100_setup_timezone.sh
@@ -1,31 +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
-
-#######################################
-# Configure timezone.
-# Globals:
-#   TARGET
-#   ntp_timezone
-# Arguments:
-#   None
-# Returns:
-#   0: on success
-#######################################
-setup_timezone() {
-  do_in_target "${TARGET}" ln -sf "/usr/share/zoneinfo/${ntp_timezone}" /etc/localtime
-  do_in_target_script "${TARGET}" "echo ${ntp_timezone} | tee /etc/timezone"
-  do_in_target "${TARGET}" dpkg-reconfigure -f noninteractive tzdata
-  return 0
-}
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
--- a/func/system/4110_setup_locales.sh
+++ b/func/system/4110_setup_locales.sh
@@ -1,59 +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
-
-#######################################
-# Set locale and configure keyboard layout.
-# Globals:
-#   TARGET
-#   locale_country
-#   locale_keyboard_layout
-#   locale_keyboard_xkb_keymap
-#   locale_language
-#   locale_locale
-# Arguments:
-#   None
-# Returns:
-#   0: on success
-#######################################
-setup_locales() {
-  do_in_target "${TARGET}" apt-get install -y locales
-  mkdir -p "${TARGET}/etc/default"
-
-  ### 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'.
-  if [[ -n "${locale_language:-}" && -n "${locale_country:-}" && -z "${locale_locale:-}" ]]; then
-    declare locale_locale="${locale_language}_${locale_country}.UTF-8"
-  fi
-
-  [[ -n "${locale_locale:-}" ]] || do_log "error" "file_only" "4110() Variable '${locale_locale}' is not set."
-
-  ### Generate the specified locale
-  do_in_target "${TARGET}" locale-gen "${locale_locale}"
-
-  ### 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}"
-
-  ### 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'."
-
-  ### Set the X11 keyboard layout (for graphical environments).
-  do_in_target "${TARGET}" localectl set-x11-keymap "${locale_keyboard_xkb_keymap}"
-
-  return 0
-}
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
--- a/func/system/4130_setup_network.sh
+++ b/func/system/4130_setup_network.sh
@@ -57,59 +57,6 @@ setup_network() {
    var_auto_ipv6_ccidr="" var_auto_ipv6="" var_auto_ipv6_gw="" var_link_ipv4="" var_link_ipv6="" var_auto_fqdn="" ns=""
  declare -a ary_ipv4_ns=() ary_ipv6_ns=()

-  ary_ipv4_ns+=("${network_static_ipv4nameserver_0}")
-  [[ -v network_static_ipv4nameserver_1 ]] && ary_ipv4_ns+=("${network_static_ipv4nameserver_1}")
-  [[ -v network_static_ipv4nameserver_2 ]] && ary_ipv4_ns+=("${network_static_ipv4nameserver_2}")
-  [[ -v network_static_ipv4nameserver_fallback_0 ]] && ary_ipv4_ns+=("${network_static_ipv4nameserver_fallback_0}")
-  [[ -v network_static_ipv4nameserver_fallback_1 ]] && ary_ipv4_ns+=("${network_static_ipv4nameserver_fallback_1}")
-
-  ary_ipv6_ns+=("${network_static_ipv6nameserver_0}")
-  [[ -v network_static_ipv6nameserver_1 ]] && ary_ipv6_ns+=("${network_static_ipv6nameserver_1}")
-  [[ -v network_static_ipv6nameserver_2 ]] && ary_ipv6_ns+=("${network_static_ipv6nameserver_2}")
-  [[ -v network_static_ipv6nameserver_fallback_0 ]] && ary_ipv6_ns+=("${network_static_ipv6nameserver_fallback_0}")
-  [[ -v network_static_ipv6nameserver_fallback_1 ]] && ary_ipv6_ns+=("${network_static_ipv6nameserver_fallback_1}")
-
-  ### Check current network connection and configure variables
-  # shellcheck disable=SC2312
-  var_auto_nic=$(ip -o link show | awk -F': ' '/state UP/ && $2!="lo" {print $2; exit}')
-  # shellcheck disable=SC2312
-  var_auto_ipv4_ccidr=$(ip -4 -o addr show "${var_auto_nic}" | awk '{print $4; exit}')
-  # shellcheck disable=SC2312
-  var_auto_ipv4_subnet=$(generate_subnetmask "${var_auto_ipv4_ccidr}")
-  # shellcheck disable=SC2312
-  var_auto_ipv4=$(echo "${var_auto_ipv4_ccidr}" | awk -F'/' '{print $1}')
-  # shellcheck disable=SC2312
-  var_auto_ipv4_gw=$(ip route show default dev "${var_auto_nic}" | awk '/^default/ {print $3; exit}')
-  # shellcheck disable=SC2312
-  var_auto_ipv6_ccidr=$(ip -6 -o addr show "${var_auto_nic}" | awk '/scope global/ {print $4; exit}')
-  if [[ -n "${var_auto_ipv6_ccidr}" ]]; then
-    # shellcheck disable=SC2312
-    var_auto_ipv6=$(echo "${var_auto_ipv6_ccidr}" | awk -F'/' '{print $1}')
-    # shellcheck disable=SC2312
-    var_auto_ipv6_gw=$(ip -6 route show default dev "${var_auto_nic}" | awk '/^default/ {print $3; exit}')
-  fi
-  # shellcheck disable=SC2312
-  var_link_ipv4=$(ping -q -c 1 -W 1 -4 debian.org > /dev/null 2>&1 && echo "true" || echo "false")
-  # shellcheck disable=SC2312
-  var_link_ipv6=$(ping -q -c 1 -W 1 -6 debian.org > /dev/null 2>&1 && echo "true" || echo "false")
-  if [[ -f "/var/lib/dhcp/dhclient.${var_auto_nic}.leases" ]]; then
-    # shellcheck disable=SC2312
-    var_auto_fqdn=$(grep -m1 'option host-name' "/var/lib/dhcp/dhclient.${var_auto_nic}.leases" | sed -E 's/.*"([^"]+)".*/\1/')
-  else
-    var_auto_fqdn=""
-  fi
-
-  do_log "info" "file_only" "4130() Live environment network check: Auto NIC          ='${var_auto_nic}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto IPv4         ='${var_auto_ipv4}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto IPv4 CCIDR   ='${var_auto_ipv4_ccidr}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto IPv4 Subnet  ='${var_auto_ipv4_subnet}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto IPv4 Gateway ='${var_auto_ipv4_gw}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto IPv6         ='${var_auto_ipv6}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto IPv6 CCIDR   ='${var_auto_ipv6_ccidr}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto IPv6 Gateway ='${var_auto_ipv6_gw}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto IPv4 Link    ='${var_link_ipv4}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto IPv6 Link    ='${var_link_ipv6}'."
-  do_log "info" "file_only" "4130() Live environment network check: Auto FQDN         ='${var_auto_fqdn}'."

  ### Create network configuration file header.
  if [[ -f "${TARGET}/etc/network/interfaces" ]]; then
@@ -284,61 +231,6 @@ EOF

  fi

-  if [[ -f "${TARGET}/etc/resolv.conf" ]]; then
-    mkdir -p "${DIR_BAK}/etc"
-    mv "${TARGET}/etc/resolv.conf" "${DIR_BAK}/etc/resolv.conf.bak"
-    do_log "info" "file_only" "4130() Existing '${TARGET}/etc/resolv.conf' moved."
-  fi
-
-  touch "${TARGET}/etc/resolv.conf"
-  chmod 0644 "${TARGET}/etc/resolv.conf"
-
-  ### Create '/etc/resolv.conf' IPv4 entries for static configuration.
-  if [[ "${network_autoconfig_enable,,}" == "false" ]]; then
-    cat << EOF >> "${TARGET}/etc/resolv.conf"
-# 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
-
-# Custom DNS IPv4 configuration
-EOF
-
-    for ns in "${ary_ipv4_ns[@]}"; do
-      echo "nameserver ${ns}" >> "${TARGET}/etc/resolv.conf"
-    done
-
-    echo "" >> "${TARGET}/etc/resolv.conf"
-    do_log "info" "file_only" "4130() IPv4 nameserver at: '${TARGET}/etc/resolv.conf' configured manually."
-
-  fi
-
-  ### Create '/etc/resolv.conf' IPv6 entries for static configuration.
-  if [[ "${network_autoconfig_enable,,}" == "false" && -n "${network_static_ipv6address}" ]]; then
-
-    cat << EOF >> "${TARGET}/etc/resolv.conf"
-# Custom DNS IPv6 configuration
-EOF
-
-    for ns in "${ary_ipv6_ns[@]}"; do
-      echo "nameserver ${ns}" >> "${TARGET}/etc/resolv.conf"
-    done
-
-    echo "" >> "${TARGET}/etc/resolv.conf"
-    do_log "info" "file_only" "4130() IPv6 nameserver at: '${TARGET}/etc/resolv.conf' configured manually."
-
-  fi
-
-  cat << EOF >> "${TARGET}/etc/resolv.conf"
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
-EOF
-
  ### Ensure Internet Systems Consortium DHCP Client is not overwriting the static nameserver settings.
  if [[ -f "${TARGET}/etc/dhcp/dhclient.conf" ]]; then
    mkdir -p "${DIR_BAK}/etc/dhcp"
@@ -378,39 +270,6 @@ EOF
 EOF
  fi

-  ### Export hostname and IPv4 and IPv6 addresses for further processing according to dynamic results and preseed.yaml settings.
-  if [[ "${network_autoconfig_enable,,}" == "true" ]]; then
-
-    declare -grx VAR_FINAL_NIC="${var_auto_nic}"
-    declare -grx VAR_FINAL_FQDN="${var_auto_fqdn}"
-    declare -grx VAR_FINAL_IPV4="${var_auto_ipv4}"
-    declare -grx VAR_FINAL_IPV4_GW="${var_auto_ipv4_gw}"
-    declare -grx VAR_FINAL_IPV4_SUBNET="${var_auto_ipv4_subnet}"
-
-  else
-
-    declare -grx VAR_FINAL_NIC="${network_choose_interface_static}"
-    declare -grx VAR_FINAL_FQDN="${network_hostname}"
-    declare -grx VAR_FINAL_IPV4="${network_static_ipv4address}"
-    declare -grx VAR_FINAL_IPV4_GW="${network_static_ipv4gateway}"
-    declare -grx VAR_FINAL_IPV4_SUBNET="${network_static_ipv4netmask}"
-
-  fi
-
-  if [[ "${network_autoconfig_enable,,}" == "true" && "${var_link_ipv6,,}" == "true" ]]; then
-
-    declare -grx VAR_FINAL_IPV6="${var_auto_ipv6}"
-    declare -grx VAR_LINK_IPV6="${var_link_ipv6}"
-
-  elif [[ "${network_autoconfig_enable,,}" == "false" && -n "${network_static_ipv6address}" ]]; then
-
-    declare -grx VAR_FINAL_IPV6="${network_static_ipv6address}"
-
-  else
-
-    declare -grx VAR_FINAL_IPV6=""
-
-  fi

  return 0
 }
--- a/func/system/4140_setup_hostname.sh
+++ b/func/system/4140_setup_hostname.sh
@@ -1,74 +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
-
-#######################################
-# Generate files: '/etc/hostname' | '/etc/hosts' | '/etc/mailname'
-# Globals:
-#   TARGET
-#   VAR_FINAL_FQDN
-#   VAR_FINAL_IPV4
-#   VAR_FINAL_IPV6
-#   VAR_LINK_IPV6
-#   network_ipv6
-# Arguments:
-#   None
-# Returns:
-#   0: on success
-#######################################
-setup_hostname() {
-  ### Create '${TARGET}/etc/hostname' file.
-  cat << EOF >| "${TARGET}/etc/hostname"
-${VAR_FINAL_FQDN}
-EOF
-  chmod 0644 "${TARGET}/etc/hostname"
-  do_log "info" "file_only" "File generated: '${TARGET}/etc/hostname' | hostname '${VAR_FINAL_FQDN}'."
-
-  ### Create '${TARGET}/etc/mailname' file.
-  cat << EOF >| "${TARGET}/etc/mailname"
-${VAR_FINAL_FQDN}
-EOF
-  chmod 0644 "${TARGET}/etc/mailname"
-  do_log "info" "file_only" "File generated: '${TARGET}/etc/mailname' | mailname '${VAR_FINAL_FQDN}'."
-
-  ### Generate '${TARGET}/etc/hosts' basic IPv4 entries
-  cat << EOF >| "${TARGET}/etc/hosts"
-127.0.0.1 localhost
-${VAR_FINAL_IPV4} ${VAR_FINAL_FQDN}
-
-EOF
-  chmod 0644 "${TARGET}/etc/hosts"
-  do_log "info" "file_only" "File generated: '${TARGET}/etc/hosts' with basic IPv4 entries."
-
-  ### Generate '${TARGET}/etc/hosts' basic IPv6 entries
-  if [[ "${VAR_LINK_IPV6,,}" == "true" || "${network_ipv6,,}" == "true" ]]; then
-
-    cat << EOF >> "${TARGET}/etc/hosts"
-# The following lines are desirable for IPv6 capable hosts
-::1     localhost ip6-localhost ip6-loopback
-fe00::0 ip6-localnet
-ff00::0 ip6-mcastprefix
-ff02::1 ip6-allnodes
-ff02::2 ip6-allrouters
-ff02::3 ip6-allhosts
-${VAR_FINAL_IPV6} ${VAR_FINAL_FQDN}
-
-EOF
-
-    do_log "info" "file_only" "File updated: '${TARGET}/etc/hosts' with basic IPv6 entries."
-
-  fi
-
-  return 0
-}
-# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh