V8.04.002.2025.08.11
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 53s

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-08-12 14:06:53 +02:00
parent 4f990ff360
commit ad9a7be0c0
4 changed files with 10 additions and 65 deletions

View File

@@ -216,7 +216,6 @@ lb_config_start
if [[ "${VAR_SUITE}" == "bookworm" ]]; then if [[ "${VAR_SUITE}" == "bookworm" ]]; then
lb_config_write 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.chroot"
rm -f "${SCRIPT_BASEPATH}/config/hooks/live/9998_sources_list_trixie.hook.binary"
else else
lb_config_write_trixie lb_config_write_trixie
rm -f "${SCRIPT_BASEPATH}/config/hooks/live/0003_install_backports.chroot" rm -f "${SCRIPT_BASEPATH}/config/hooks/live/0003_install_backports.chroot"

View File

@@ -16,6 +16,16 @@ printf "\e[95m++++ ++++ ++++ ++++ ++++ ++++ ++ 🧪 '%s' starting ... \e[0m\n" "
cd /root 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 if [[ ! -f /etc/apt/sources.list.d/trixie.sources ]]; then
cat << EOF >| /etc/apt/sources.list.d/trixie.sources cat << EOF >| /etc/apt/sources.list.d/trixie.sources
# SPDX-Version: 3.0 # SPDX-Version: 3.0

View File

@@ -1,63 +0,0 @@
#!/bin/bash
# SPDX-Version: 3.0
# SPDX-CreationInfo: 2025-08-12; WEIDNER, Marc S.; <msw@coresecret.dev>
# 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.; <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.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.; <msw@coresecret.dev>
# 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.; <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.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.; <msw@coresecret.dev>
# 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.; <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.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

View File

@@ -25,7 +25,6 @@ check_hooks() {
ifs=$'\n\t' ifs=$'\n\t'
shopt -s nullglob shopt -s nullglob
declare -a files=("${VAR_WORKDIR}"/config/hooks/live/*.chroot) declare -a files=("${VAR_WORKDIR}"/config/hooks/live/*.chroot)
files+=("${VAR_WORKDIR}"/config/hooks/live/*.hook.binary)
if (( ${#files[@]} == 0 )); then if (( ${#files[@]} == 0 )); then
printf "\e[91m❌ No '*.chroot' files found in '%s/config/hooks/live'. \e[0m\n" "${VAR_WORKDIR}" >&2 printf "\e[91m❌ No '*.chroot' files found in '%s/config/hooks/live'. \e[0m\n" "${VAR_WORKDIR}" >&2