From 3920b29fc669d9f810608bd580102317bdd99b5c47abdaf1cf4ad3c01540e1d7 Mon Sep 17 00:00:00 2001 From: "Marc S. Weidner" Date: Fri, 5 Dec 2025 15:46:32 +0100 Subject: [PATCH] V8.13.544.2025.12.05 Signed-off-by: Marc S. Weidner --- .gitea/trigger/t_generate_PRIVATE_trixie_1.yaml | 2 +- .gitea/workflows/generate_PRIVATE_trixie_1.yaml | 1 - config/hooks/live/zzzz_ciss_crypt_squash.hook.binary | 4 ++-- docs/DOCUMENTATION.md | 3 --- lib/lib_usage.sh | 3 --- var/global.var.sh | 1 - 6 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml b/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml index ebc022f..5ea17c4 100644 --- a/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml +++ b/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml @@ -10,6 +10,6 @@ # SPDX-Security-Contact: security@coresecret.eu build: - counter: 1024 + counter: 1023 version: V8.13.544.2025.12.05 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=yaml diff --git a/.gitea/workflows/generate_PRIVATE_trixie_1.yaml b/.gitea/workflows/generate_PRIVATE_trixie_1.yaml index 231afe1..a339d7e 100644 --- a/.gitea/workflows/generate_PRIVATE_trixie_1.yaml +++ b/.gitea/workflows/generate_PRIVATE_trixie_1.yaml @@ -214,7 +214,6 @@ jobs: --autobuild=6.17.8+deb13-amd64 \ --build-directory /opt/cdlb \ --cdi \ - --cicd \ --change-splash hexagon \ --control "${timestamp}" \ --jump-host ${{ secrets.CISS_DLB_JUMP_HOSTS_1 }} \ diff --git a/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary b/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary index d5a8917..973c342 100644 --- a/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary +++ b/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary @@ -80,7 +80,7 @@ preallocate "${LUKSFS}" "${VAR_LUKSFS_SIZE}" exec {KEYFD}<"${VAR_TMP_SECRET}/luks.txt" -if [[ "${VAR_GITEA_RUNNER}" == "false" ]]; then +if [[ "${VAR_CDLB_INSIDE_RUNNER}" == "false" ]]; then cryptsetup luksFormat \ --batch-mode \ @@ -99,7 +99,7 @@ if [[ "${VAR_GITEA_RUNNER}" == "false" ]]; then --verbose \ "${LUKSFS}" -elif [[ "${VAR_GITEA_RUNNER}" == "true" ]]; then +elif [[ "${VAR_CDLB_INSIDE_RUNNER}" == "true" ]]; then cryptsetup luksFormat \ --batch-mode \ diff --git a/docs/DOCUMENTATION.md b/docs/DOCUMENTATION.md index ad225d1..5bb33a0 100644 --- a/docs/DOCUMENTATION.md +++ b/docs/DOCUMENTATION.md @@ -47,9 +47,6 @@ A lightweight Shell Wrapper for building a hardened Debian Live ISO Image. This option creates a boot menu entry that starts the forthcoming 'CISS.debian.installer', which is executed once the system has successfully booted up. - --cicd - This option MUST be set if the CDLB is executed inside a Gitea Action Runner. - --contact, -c Show author contact information. diff --git a/lib/lib_usage.sh b/lib/lib_usage.sh index 946a8d7..ad063c4 100644 --- a/lib/lib_usage.sh +++ b/lib/lib_usage.sh @@ -77,9 +77,6 @@ usage() { echo " This option creates a boot menu entry that starts the forthcoming 'CISS.debian.installer', which is executed" echo " once the system has successfully booted up." echo - echo -e "\e[97m --cicd\e[0m" - echo " This option MUST be set if the CDLB is executed inside a Gitea Action Runner." - echo echo -e "\e[97m --contact, -c\e[0m" echo " Show author contact information." echo diff --git a/var/global.var.sh b/var/global.var.sh index 38f2b03..274cef4 100644 --- a/var/global.var.sh +++ b/var/global.var.sh @@ -29,7 +29,6 @@ touch "${LOG_ERROR}" && chmod 0600 "${LOG_ERROR}" declare -g __umask="" declare -g VAR_ARCHITECTURE="" declare -g VAR_CDLB_INSIDE_RUNNER="${VAR_CDLB_INSIDE_RUNNER:-false}" -declare -g VAR_GITEA_RUNNER="false" declare -g VAR_HANDLER_BUILD_DIR="" declare -g VAR_HANDLER_CDI="false" declare -g VAR_HANDLER_NETCUP_IPV6="false"