V8.00.000.2025.06.17
All checks were successful
🛡️ Shell Script Linting / 🛡️ Shell Script Linting (push) Successful in 1m11s

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-10-05 17:01:51 +01:00
parent d2ee1e2963
commit 89e6ae9890
7 changed files with 12 additions and 9 deletions

View File

@@ -1 +1 @@
a21c7ab831616a8f880a5fb528d4eea3e0095da956ed5665255f9845a7dadf43020dd794c19deeb7b98ca8a3836e46c35c214a5da4f5a5b2ae63ebf10c9c67f1 2d90783e0ffba3c6972b3a0d5335cca4a37c03b417f43b62b082a83734d4e4148390ac22509e68d63aaca11baf4fb081747f83347eab08176fb647e5445372f6

View File

@@ -91,6 +91,14 @@ EOF
cat << EOF >> "${TARGET}/etc/initramfs-tools/conf.d/fsroot" cat << EOF >> "${TARGET}/etc/initramfs-tools/conf.d/fsroot"
FSTYPE=${VAR_ROOT_FS} FSTYPE=${VAR_ROOT_FS}
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
EOF
insert_header "${TARGET}/etc/initramfs-tools/conf.d/resume"
insert_comments "${TARGET}/etc/initramfs-tools/conf.d/resume"
cat << EOF >> "${TARGET}/etc/initramfs-tools/conf.d/resume"
RESUME=none
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
EOF EOF

View File

@@ -122,12 +122,12 @@ EOF
swap) swap)
#write_crypttab "${var_ephemeral_enclabel}" "LABEL=${var_host_fs_label}" "/dev/random" "swap,offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard" #write_crypttab "${var_ephemeral_enclabel}" "LABEL=${var_host_fs_label}" "/dev/random" "swap,offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard"
write_crypttab "${var_ephemeral_enclabel}" "PARTUUID=${var_host_partuuid}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard,plain,x-systemd.device-timeout=10s,swap" write_crypttab "${var_ephemeral_enclabel}" "PARTUUID=${var_host_partuuid}" "/dev/urandom" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard,plain,swap"
;; ;;
/tmp) /tmp)
#write_crypttab "${var_ephemeral_enclabel}" "LABEL=${var_host_fs_label}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard,tmp=ext4" #write_crypttab "${var_ephemeral_enclabel}" "LABEL=${var_host_fs_label}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard,tmp=ext4"
write_crypttab "${var_ephemeral_enclabel}" "PARTUUID=${var_host_partuuid}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard,plain,x-systemd.device-timeout=10s,tmp=ext4" write_crypttab "${var_ephemeral_enclabel}" "PARTUUID=${var_host_partuuid}" "/dev/urandom" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard,plain,tmp=ext4"
chroot_script "${TARGET}" "systemctl mask tmp.mount" chroot_script "${TARGET}" "systemctl mask tmp.mount"
do_log "info" "file_only" "4210() Masked: [tmp.mount]" do_log "info" "file_only" "4210() Masked: [tmp.mount]"
;; ;;

View File

@@ -437,11 +437,6 @@ main() {
trap 'trap_on_exit' EXIT trap 'trap_on_exit' EXIT
trap 'trap_on_term' INT TERM trap 'trap_on_term' INT TERM
if [[ -r /etc/dropbear/banner ]]; then
cat /etc/dropbear/banner
elif [[ -r /etc/dropbear/initramfs/banner ]]; then
cat /etc/dropbear/initramfs/banner
fi
uname -a uname -a
printf "%b" "${NL}" printf "%b" "${NL}"

View File

@@ -37,7 +37,7 @@ run_dropbear() {
# init-bottom script to kill the remaining ipconfig processes if # init-bottom script to kill the remaining ipconfig processes if
# someone unlocks the rootfs from the console while the network is # someone unlocks the rootfs from the console while the network is
# being configured # being configured
exec /sbin/dropbear "${DROPBEAR_OPTIONS-}" exec /sbin/dropbear ${DROPBEAR_OPTIONS-}
} }
# shellcheck disable=SC2292 # shellcheck disable=SC2292