V8.00.000.2025.06.17

Signed-off-by: Marc S. Weidner <msw@coresecret.dev>

.preseed/preseed.yaml

@@ -615,6 +615,7 @@ software:
   # initramfs-tools
   # jq
   # kbd
+  # keyutils
   # libpam-pwquality
   # lsb-release
   # parted
@@ -750,7 +751,6 @@ software:
   - figlet
   - htop
   - keychain
-  - keyutils
   - python3
   - virt-what
 

func/cdi_4100_base/4130_installation_toolset.sh

@@ -54,6 +54,7 @@ installation_toolset() {
     [jq]="jq"
     [loadkeys]="kbd"
     [setfont]="kbd"
+    [keyctl]="keyutils"
     [libpam-pwquality]="libpam-pwquality"
     [lsb_release]="lsb-release"
     [parted]="parted"

func/cdi_4200_boot/4210_generate_crypttab.sh

@@ -94,7 +94,7 @@ EOF
           ;;
 
         "/boot")
-          write_crypttab "${var_encryption_label}" "UUID=${var_luks_uuid}" "none" "luks,discard,noauto,x-systemd.device-timeout=0,tries=1"
+          write_crypttab "${var_encryption_label}" "UUID=${var_luks_uuid}" "none" "luks,discard,noauto"
           ;;
 
         *)
@@ -122,12 +122,12 @@ EOF
 
       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" "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,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" "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"
         #chroot_script "${TARGET}" "systemctl mask tmp.mount"
         #do_log "info" "file_only" "4210() Masked: [tmp.mount]"
         ;;