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

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
2025-08-31 22:01:19 +02:00
parent 8fb9a227e9
commit b55ef42ea5
5 changed files with 12 additions and 12 deletions

View File

@@ -419,7 +419,7 @@ grub_parameter:
grub: grub:
background: # RECOMMENDED settings: JPG 1280 x 1024 px or JPG 1920 x 1080 px background: # RECOMMENDED settings: JPG 1280 x 1024 px or JPG 1920 x 1080 px
enable: true # If you want to add a GRUB background. enable: true # If you want to add a GRUB background.
path: "/includes/target/etc/default/grub.d/hexagon_640_480.png" path: "/includes/target/etc/default/grub.d/hexagon_1280_720.png"
bootdev: "/dev/sda" # Due notably to potential USB sticks, the location of the primary drive cannot be determined bootdev: "/dev/sda" # Due notably to potential USB sticks, the location of the primary drive cannot be determined
# safely in general, so this needs to be specified. # safely in general, so this needs to be specified.
force_efi: true # Force GRUB installation to the EFI removable media path? force_efi: true # Force GRUB installation to the EFI removable media path?

View File

@@ -91,7 +91,7 @@ EOF
var_fs_uuid="/dev/mapper/${var_dmapper}" var_fs_uuid="/dev/mapper/${var_dmapper}"
var_fs_path="${var_path}" var_fs_path="${var_path}"
var_fs_type="${HMP_FSTAB_MOUNT_FTYPE["${var_path}"]}" var_fs_type="${HMP_FSTAB_MOUNT_FTYPE["${var_path}"]}"
var_fs_opts="${HMP_FSTAB_MOUNT_OPTS["${var_path}"]}" var_fs_opts="${HMP_FSTAB_MOUNT_OPTS["${var_path}"]},x-systemd.makefs,x-systemd.fsck=no"
var_fs_pass="0" var_fs_pass="0"
;; ;;

View File

@@ -122,15 +122,20 @@ EOF
var_ephemeral_enclabel="${HMP_EPHEMERAL_ENCLABEL["${var_key}"]}" var_ephemeral_enclabel="${HMP_EPHEMERAL_ENCLABEL["${var_key}"]}"
var_host_fs_label="${HMP_EPHEMERAL_FS_LABEL["${var_key}"]}" var_host_fs_label="${HMP_EPHEMERAL_FS_LABEL["${var_key}"]}"
var_host_partuuid="${HMP_PATH_PARTUUID["${var_key}"]}"
case "${var_key,,}" in case "${var_key,,}" in
swap) swap)
write_crypttab "${var_ephemeral_enclabel}" "LABEL=${var_host_fs_label}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard,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,plain"
write_crypttab "${var_ephemeral_enclabel}" "UUID=${var_host_partuuid}" "/dev/random" "swap,offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard,plain"
;; ;;
/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}" "UUID=${var_host_partuuid}" "/dev/random" "offset=2048,cipher=aes-xts-plain64,size=512,sector-size=4096,discard,plain"
chroot_script "${TARGET}" "systemctl mask tmp.mount"
do_log "info" "file_only" "4210() Masked: [tmp.mount]"
;; ;;
*) *)

View File

@@ -128,7 +128,7 @@ GRUB_BACKGROUND="/etc/default/grub.d/${var_background}"
# note that you can use only modes which your graphic card supports via VBE # note that you can use only modes which your graphic card supports via VBE
# you can see them in real GRUB with the command 'vbeinfo' # you can see them in real GRUB with the command 'vbeinfo'
# GRUB_GFXMODE=1920x1080,1280x1024,1024x768,800x600 # GRUB_GFXMODE=1920x1080,1280x1024,1024x768,800x600
GRUB_GFXMODE=800x600 GRUB_GFXMODE=1280x1024
GRUB_GFXPAYLOAD_LINUX=keep GRUB_GFXPAYLOAD_LINUX=keep
EOF EOF

View File

@@ -64,13 +64,8 @@ Pin-Priority: -1
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf # vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=conf
EOF EOF
chroot_script "${TARGET}" " chroot_script "${TARGET}" "systemctl mask dropbear.service dropbear.socket"
systemctl mask dropbear.service dropbear.socket do_log "info" "file_only" "4311() Masked: [dropbear.service dropbear.socket]"
"
do_log "info" "file_only" "4133() Masked: [dropbear.service dropbear.socket]"
guard_dir && return 0 guard_dir && return 0
} }