From 346fc447a21475773255cf261c2b71fd3dd5e3014848f022f6fc593a672c0dbb Mon Sep 17 00:00:00 2001 From: "Marc S. Weidner" Date: Wed, 19 Nov 2025 07:43:54 +0000 Subject: [PATCH] V8.13.440.2025.11.19 Signed-off-by: Marc S. Weidner --- .../live/zzzz_ciss_crypt_squash.hook.binary | 2 +- .../hooks/9999_ciss_debian_live_builder.sh | 66 ++----------------- 2 files changed, 8 insertions(+), 60 deletions(-) diff --git a/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary b/config/hooks/live/zzzz_ciss_crypt_squash.hook.binary index f9fe976..0b34bd2 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 SIZE=$(stat -c%s -- "${ROOTFS}") # - dm-integrity Overhead (Tags and Journal) # - Filesystem-Slack declare -i OVERHEAD_FIXED=$((64 * 1024 * 1024)) -declare -i OVERHEAD_PCT=3 +declare -i OVERHEAD_PCT=1.6 declare -i ALIGN_BYTES=$(( 2048 * 1024 )) declare -i BASE_SIZE=$(( SIZE + OVERHEAD_FIXED + (SIZE * OVERHEAD_PCT / 100) )) declare -i LUKSFS_SIZE=$(( ( (BASE_SIZE + ALIGN_BYTES - 1) / ALIGN_BYTES ) * ALIGN_BYTES )) diff --git a/config/includes.chroot/etc/initramfs-tools/hooks/9999_ciss_debian_live_builder.sh b/config/includes.chroot/etc/initramfs-tools/hooks/9999_ciss_debian_live_builder.sh index 6d5dea9..693d57b 100644 --- a/config/includes.chroot/etc/initramfs-tools/hooks/9999_ciss_debian_live_builder.sh +++ b/config/includes.chroot/etc/initramfs-tools/hooks/9999_ciss_debian_live_builder.sh @@ -35,69 +35,17 @@ install -d -m 0755 "${DESTDIR}/usr/bin" install -d -m 0755 "${DESTDIR}/usr/local/bin" install -d -m 0755 "${DESTDIR}/usr/sbin" +### Include binaries ----------------------------------------------------------------------------------------------------------- +for bin in bash blkid busybox dmsetup gpgv losetup lsblk mkpasswd mountpoint sha384sum sha512sum sort timeout tree udevadm whois; do -### Include 'bash' ------------------------------------------------------------------------------------------------------------- -copy_exec /usr/bin/bash /usr/bin/bash -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/bash /usr/bin/bash] \n\e[0m" + path="$(command -v "${bin}" 2>/dev/null || true)" + [ -z "${path}" ] && continue -### Include 'blkid' ------------------------------------------------------------------------------------------------------------ -copy_exec /usr/sbin/blkid /usr/sbin/blkid -printf "\e[92mSuccessfully executed: [copy_exec /usr/sbin/blkid /usr/sbin/blkid] \n\e[0m" + copy_exec "${path}" "${path}" + printf "\e[92mSuccessfully executed: [copy_exec %s %s] \n\e[0m" "${path}" "${path}" - -### Include 'busybox' ---------------------------------------------------------------------------------------------------------- -copy_exec /usr/bin/busybox /usr/bin/busybox -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/busybox /usr/bin/busybox] \n\e[0m" - - -### Include 'dmsetup' ---------------------------------------------------------------------------------------------------------- -copy_exec /usr/sbin/dmsetup /usr/sbin/dmsetup -printf "\e[92mSuccessfully executed: [copy_exec /usr/sbin/dmsetup /usr/sbin/dmsetup] \n\e[0m" - - -### Include GNU coreutils 'sort' (has -V) -------------------------------------------------------------------------------------- -copy_exec /usr/bin/sort /usr/bin/sort -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/sort /usr/bin/sort] \n\e[0m" - - -### Include 'gpgv' ------------------------------------------------------------------------------------------------------------- -copy_exec /usr/bin/gpgv /usr/bin/gpgv -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/gpgv /usr/bin/gpgv] \n\e[0m" - - -### Include 'lsblk' ------------------------------------------------------------------------------------------------------------ -copy_exec /usr/bin/lsblk /usr/bin/lsblk -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/lsblk /usr/bin/lsblk] \n\e[0m" - - -### Include 'mkpasswd' --------------------------------------------------------------------------------------------------------- -copy_exec /usr/bin/mkpasswd /usr/mkpasswd -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/mkpasswd /usr/mkpasswd] \n\e[0m" -copy_exec /usr/bin/mkpasswd /usr/bin/mkpasswd -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/mkpasswd /usr/bin/mkpasswd] \n\e[0m" - - -### Include 'udevadm' (udev management tool) ----------------------------------------------------------------------------------- -copy_exec /usr/bin/udevadm /usr/bin/udevadm -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/udevadm /usr/bin/udevadm] \n\e[0m" - - -### Include 'sha384sum' 'sha512sum' -------------------------------------------------------------------------------------------- -copy_exec /usr/bin/sha384sum /usr/bin/sha384sum -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/sha384sum /usr/bin/sha384sum ] \n\e[0m" -copy_exec /usr/bin/sha512sum /usr/bin/sha512sum -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/sha512sum /usr/bin/sha512sum] \n\e[0m" - - -### Include 'tree' ------------------------------------------------------------------------------------------------------------- -copy_exec /usr/bin/tree /usr/bin/tree -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/tree /usr/bin/tree] \n\e[0m" - - -### Include 'whois' ------------------------------------------------------------------------------------------------------------ -copy_exec /usr/bin/whois /usr/bin/whois -printf "\e[92mSuccessfully executed: [copy_exec /usr/bin/whois /usr/bin/whois] \n\e[0m" +done ### Link busybox applets for compatibility -------------------------------------------------------------------------------------