diff --git a/ciss_live_builder.sh b/ciss_live_builder.sh index bc59554..4abfe38 100644 --- a/ciss_live_builder.sh +++ b/ciss_live_builder.sh @@ -216,7 +216,6 @@ lb_config_start if [[ "${VAR_SUITE}" == "bookworm" ]]; then lb_config_write rm -f "${SCRIPT_BASEPATH}/config/hooks/live/9998_sources_list_trixie.chroot" - rm -f "${SCRIPT_BASEPATH}/config/hooks/live/9998_sources_list_trixie.hook.binary" else lb_config_write_trixie rm -f "${SCRIPT_BASEPATH}/config/hooks/live/0003_install_backports.chroot" diff --git a/config/hooks/live/9998_sources_list_trixie.chroot b/config/hooks/live/9998_sources_list_trixie.chroot index 31eb0ec..f9437e0 100644 --- a/config/hooks/live/9998_sources_list_trixie.chroot +++ b/config/hooks/live/9998_sources_list_trixie.chroot @@ -16,6 +16,16 @@ printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ 🧪 '%s' starting ... \e[0m\n" " cd /root +mkdir -p /etc/apt/apt.conf.d + +cat << EOF >| /etc/apt/apt.conf.d/00-deb822-prefer +// Make APT ignore the classic /etc/apt/sources.list entirely. +Dir::Etc { + sourcelist "/dev/null"; // classic list is ignored + sourceparts "/etc/apt/sources.list.d"; // deb822 *.sources remain authoritative +} +EOF + if [[ ! -f /etc/apt/sources.list.d/trixie.sources ]]; then cat << EOF >| /etc/apt/sources.list.d/trixie.sources # SPDX-Version: 3.0 diff --git a/config/hooks/live/9998_sources_list_trixie.hook.binary b/config/hooks/live/9998_sources_list_trixie.hook.binary deleted file mode 100644 index e13ae80..0000000 --- a/config/hooks/live/9998_sources_list_trixie.hook.binary +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/bash -# SPDX-Version: 3.0 -# SPDX-CreationInfo: 2025-08-12; WEIDNER, Marc S.; -# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.live.builder.git -# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency -# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; -# 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.live.builder -# SPDX-Security-Contact: security@coresecret.eu -set -C -e -u -o pipefail - -printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ 🧪 '%s' starting ... \e[0m\n" "${0}" - -if [[ -f "${VAR_HANDLER_BUILD_DIR}/chroot/etc/apt/sources.list" ]]; then - - cat << EOF >| ${VAR_HANDLER_BUILD_DIR}/chroot/etc/apt/sources.list" -# SPDX-Version: 3.0 -# SPDX-CreationInfo: 2025-08-12; WEIDNER, Marc S.; -# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.live.builder.git -# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency -# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; -# 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.live.builder -# SPDX-Security-Contact: security@coresecret.eu - -# File: /etc/apt/sources.list -# Intentionally empty, disable classic sources.list generation (deb822 in use). - -# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf - -EOF - -else - - cat << EOF >| ${VAR_HANDLER_BUILD_DIR}/chroot/etc/apt/sources.list" -# SPDX-Version: 3.0 -# SPDX-CreationInfo: 2025-08-12; WEIDNER, Marc S.; -# SPDX-ExternalRef: GIT https://git.coresecret.dev/msw/CISS.debian.live.builder.git -# SPDX-FileContributor: WEIDNER, Marc S.; Centurion Intelligence Consulting Agency -# SPDX-FileCopyrightText: 2024-2025; WEIDNER, Marc S.; -# 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.live.builder -# SPDX-Security-Contact: security@coresecret.eu - -# File: /etc/apt/sources.list -# Intentionally empty, disable classic sources.list generation (deb822 in use). - -# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf - -EOF - -fi - -printf "\e[92m++++ ++++ ++++ ++++ ++++ ++++ ++ ✅ '%s' applied successfully. \e[0m\n" "${0}" - -exit 0 -# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh diff --git a/lib/lib_check_hooks.sh b/lib/lib_check_hooks.sh index 222fa8d..199befe 100644 --- a/lib/lib_check_hooks.sh +++ b/lib/lib_check_hooks.sh @@ -25,7 +25,6 @@ check_hooks() { ifs=$'\n\t' shopt -s nullglob declare -a files=("${VAR_WORKDIR}"/config/hooks/live/*.chroot) - files+=("${VAR_WORKDIR}"/config/hooks/live/*.hook.binary) if (( ${#files[@]} == 0 )); then printf "\e[91m❌ No '*.chroot' files found in '%s/config/hooks/live'. \e[0m\n" "${VAR_WORKDIR}" >&2