diff --git a/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml b/.gitea/trigger/t_generate_PRIVATE_trixie_1.yaml index 5ea17c4..ebc022f 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: 1023 + counter: 1024 version: V8.13.544.2025.12.05 # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=yaml diff --git a/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary b/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary index 973c342..404519e 100644 --- a/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary +++ b/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary @@ -71,7 +71,7 @@ declare -i VAR_ROOTFS_SIZE=$(stat -c%s -- "${ROOTFS}") # - dm-integrity Overhead (Tags and Journal) # - Filesystem-Slack declare -i OVERHEAD_FIXED=$((64 * 1024 * 1024)) -declare -i OVERHEAD_PCT=10 +declare -i OVERHEAD_PCT=2 declare -i ALIGN_BYTES=$(( 4096 * 1024 )) declare -i BASE_SIZE=$(( VAR_ROOTFS_SIZE + OVERHEAD_FIXED + (VAR_ROOTFS_SIZE * OVERHEAD_PCT / 100) )) declare -i VAR_LUKSFS_SIZE=$(( ( (BASE_SIZE + ALIGN_BYTES - 1) / ALIGN_BYTES ) * ALIGN_BYTES )) diff --git a/var/global.var.sh b/var/global.var.sh index 274cef4..e875d4e 100644 --- a/var/global.var.sh +++ b/var/global.var.sh @@ -28,7 +28,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_HANDLER_BUILD_DIR="" declare -g VAR_HANDLER_CDI="false" declare -g VAR_HANDLER_NETCUP_IPV6="false" @@ -51,6 +50,7 @@ declare -gr VAR_CHROOT_DIR="chroot" declare -gr VAR_PACKAGES_FILE="chroot.packages.live" declare -gx VAR_AGE="false" declare -gx VAR_AGE_KEY="" +declare -gx VAR_CDLB_INSIDE_RUNNER="${VAR_CDLB_INSIDE_RUNNER:-false}" declare -gx VAR_LUKS="false" declare -gx VAR_LUKS_KEY="" declare -gx VAR_SIGNER="false"