From 339220306ce8561ce2e698a207fb8971c3e02ba9c79abc9cf3eaaf6a12659251 Mon Sep 17 00:00:00 2001 From: "Marc S. Weidner" Date: Tue, 12 Aug 2025 12:49:19 +0200 Subject: [PATCH] V8.04.002.2025.08.11 Signed-off-by: Marc S. Weidner --- ciss_live_builder.sh | 1 + .../live/9998_sources_list_trixie.hook.binary | 63 +++++++++++++++++++ config/includes.chroot/etc/apt/sources.list | 2 +- 3 files changed, 65 insertions(+), 1 deletion(-) create mode 100644 config/hooks/live/9998_sources_list_trixie.hook.binary diff --git a/ciss_live_builder.sh b/ciss_live_builder.sh index 4abfe38..bc59554 100644 --- a/ciss_live_builder.sh +++ b/ciss_live_builder.sh @@ -216,6 +216,7 @@ 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.hook.binary b/config/hooks/live/9998_sources_list_trixie.hook.binary new file mode 100644 index 0000000..e13ae80 --- /dev/null +++ b/config/hooks/live/9998_sources_list_trixie.hook.binary @@ -0,0 +1,63 @@ +#!/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/config/includes.chroot/etc/apt/sources.list b/config/includes.chroot/etc/apt/sources.list index 8352cb3..9dfc82b 100644 --- a/config/includes.chroot/etc/apt/sources.list +++ b/config/includes.chroot/etc/apt/sources.list @@ -10,6 +10,6 @@ # SPDX-Security-Contact: security@coresecret.eu # File: /etc/apt/sources.list -# Intentionally empty โ€“ disable classic sources.list generation (deb822 in use). +# Intentionally empty, disable classic sources.list generation (deb822 in use). # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf