Merge remote-tracking branch 'origin/master'

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

.preseed/partitioning.yaml

@@ -76,7 +76,7 @@ recipe:
             version: "fat32"
           mount:
             enable: true       # MUST be "true" for "/boot/efi"
-            options: "defaults,noatime,nodev,nosuid,noexec,umask=0077"
+            options: "noauto,ro,umask=0077,uid=0,gid=0,nofail"
             optsnap: ""
             path: "/boot/efi"
           primary: primary
@@ -85,7 +85,7 @@ recipe:
           end: "3GiB"
           bootable: false
           encryption:
-            enable: false
+            enable: true
             ephemeral: false   # MUST be "false" for "/boot"
             integrity: false   # MUST be "false" for "/boot"
             cipher: "aes-xts-plain64"
@@ -106,8 +106,8 @@ recipe:
             version: "btrfs"
             options: ""
           mount:
-            enable: true       # MUST be "true" for "/boot"
+            enable: true
-            options: "defaults,nodev,nosuid,noexec,noatime,compress=no,discard=async"
+            options: "noauto,ro,nodev,nosuid,noexec,noatime,compress=no,discard=async"
             optsnap: ""
             path: "/boot"
           primary: primary

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"
+          write_crypttab "${var_encryption_label}" "UUID=${var_luks_uuid}" "none" "luks,discard,noauto,x-systemd.device-timeout=0,tries=1"
           ;;
 
         *)