From faa8c0ca19040e219b8931bb92df7a60b8b302cc257459672c3860b90e1a8d86 Mon Sep 17 00:00:00 2001 From: "Marc S. Weidner" Date: Wed, 19 Nov 2025 21:54:10 +0000 Subject: [PATCH] V8.13.440.2025.11.19 Signed-off-by: Marc S. Weidner --- config/hooks/live/zzzz_ciss_crypt_squash.hook.binary | 12 ++++++------ lib/lib_run_analysis.sh | 11 +++++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary b/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary index 6e80636..548264d 100644 --- a/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary +++ b/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary @@ -64,17 +64,17 @@ declare LUKSFS="${VAR_HANDLER_BUILD_DIR}/binary/live/ciss_rootfs.crypt" declare KEYFD="" # shellcheck disable=SC2155 -declare -gix VAR_ROOTFS_SIZE=$(stat -c%s -- "${ROOTFS}") +declare -i VAR_ROOTFS_SIZE=$(stat -c%s -- "${ROOTFS}") ### Safety margin: # - LUKS2-Header and Metadata # - dm-integrity Overhead (Tags and Journal) # - Filesystem-Slack -declare -i OVERHEAD_FIXED=$((64 * 1024 * 1024)) -declare -i OVERHEAD_PCT=1.6 -declare -i ALIGN_BYTES=$(( 2048 * 1024 )) -declare -i BASE_SIZE=$(( VAR_ROOTFS_SIZE + OVERHEAD_FIXED + (VAR_ROOTFS_SIZE * OVERHEAD_PCT / 100) )) -declare -gix VAR_LUKSFS_SIZE=$(( ( (BASE_SIZE + ALIGN_BYTES - 1) / ALIGN_BYTES ) * ALIGN_BYTES )) +declare -i OVERHEAD_FIXED=$((64 * 1024 * 1024)) +declare -i OVERHEAD_PCT=1.6 +declare -i ALIGN_BYTES=$(( 2048 * 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 )) preallocate "${LUKSFS}" "${VAR_LUKSFS_SIZE}" diff --git a/lib/lib_run_analysis.sh b/lib/lib_run_analysis.sh index 5c9788c..0c37799 100644 --- a/lib/lib_run_analysis.sh +++ b/lib/lib_run_analysis.sh @@ -29,6 +29,17 @@ guard_sourcing || return "${ERR_GUARD_SRCE}" run_analysis() { if ! ${VAR_HANDLER_AUTOBUILD}; then clear; fi + ### zzzz_ciss_crypt_squash.hook.binary values -------------------------------------------------------------------------------- + declare ROOTFS="${VAR_HANDLER_BUILD_DIR}/binary/live/filesystem.squashfs" + # shellcheck disable=SC2155 + declare -i VAR_ROOTFS_SIZE=$(stat -c%s -- "${ROOTFS}") + declare -i OVERHEAD_FIXED=$((64 * 1024 * 1024)) + declare -i OVERHEAD_PCT=1.6 + declare -i ALIGN_BYTES=$(( 2048 * 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 )) + ### zzzz_ciss_crypt_squash.hook.binary values -------------------------------------------------------------------------------- + # shellcheck disable=SC2164 cd "${VAR_HANDLER_BUILD_DIR}"