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

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-10-07 17:27:17 +01:00
parent 914539f166
commit 72dcf355d9
17 changed files with 100 additions and 45 deletions

View File

@@ -42,6 +42,9 @@ write_fstab() {
return 0
}
### Prevents accidental 'unset -f'.
# shellcheck disable=SC2034
readonly -f write_fstab
#######################################
# Generate the '/etc/fstab' target entries.
@@ -155,7 +158,7 @@ EOF
var_fs_uuid="/dev/mapper/${var_dmapper}"
var_fs_path="none"
var_fs_type="swap"
var_fs_opts="defaults,discard,nofail,x-systemd.device-timeout=10s"
var_fs_opts="defaults,discard,x-systemd.device-timeout=10s"
var_fs_pass="0"
write_fstab "${var_fs_uuid}" "${var_fs_path}" "${var_fs_type}" "${var_fs_opts}" "${var_fs_pass}"
@@ -187,4 +190,7 @@ EOF
guard_dir && return 0
}
### Prevents accidental 'unset -f'.
# shellcheck disable=SC2034
readonly -f generate_fstab
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -50,4 +50,7 @@ check_fstab() {
guard_dir && return 0
}
### Prevents accidental 'unset -f'.
# shellcheck disable=SC2034
readonly -f check_fstab
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh

View File

@@ -125,15 +125,15 @@ EOF
case "${var_key,,}" in
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}" "PARTUUID=${var_host_partuuid}" "/dev/random" "cipher=aes-xts-plain64,size=512,discard,swap"
write_crypttab "${var_ephemeral_enclabel}" "PARTUUID=${var_host_partuuid}" "/dev/random" "plain,cipher=aes-xts-plain64,size=512,hash=plain,keyfile-size=64,discard,swap"
;;
/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}" "PARTUUID=${var_host_partuuid}" "/dev/random" "cipher=aes-xts-plain64,size=512,discard"
write_crypttab "${var_ephemeral_enclabel}" "PARTUUID=${var_host_partuuid}" "/dev/random" "plain,cipher=aes-xts-plain64,size=512,hash=plain,keyfile-size=64,discard"
chroot_script "${TARGET}" "systemctl unmask tmp.mount"
do_log "info" "file_only" "4210() Executed: [systemctl unmask tmp.mount]"
chroot_script "${TARGET}" "systemctl disable tmp.mount"
do_log "info" "file_only" "4210() Masked: [tmp.mount]"
do_log "info" "file_only" "4210() Executed: [systemctl disable tmp.mount]"
;;
*)