From 9411d3d13af0acc6fba5bdc26ac364f551e060a7 Mon Sep 17 00:00:00 2001
From: Saverio Miroddi <saverio.pub2@gmail.com>
Date: Mon, 14 Jun 2021 16:23:41 +0200
Subject: [PATCH 1/3] fstab: Make EFI partitions `nofail`

This was changed by the new procedure, however, currently, the port is not complete, and in the current form, without nofail, if one disk fails, the entire boot will fail.
---
 install-zfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-zfs.sh b/install-zfs.sh
index 5a7bb75..136a251 100755
--- a/install-zfs.sh
+++ b/install-zfs.sh
@@ -1385,7 +1385,7 @@ function prepare_fstab {
       local mountpoint=/boot/efi$((i + 1))
     fi
 
-    chroot_execute "echo /dev/disk/by-uuid/$(blkid -s UUID -o value "${v_selected_disks[i]}"-part1) $mountpoint vfat defaults 0 0 >> /etc/fstab"
+    chroot_execute "echo /dev/disk/by-uuid/$(blkid -s UUID -o value "${v_selected_disks[i]}"-part1) $mountpoint vfat nofail 0 0 >> /etc/fstab"
   done
 
   if (( v_swap_size > 0 )); then

From ca843f1b1572036acbbe1accc4c77e6cc3dc95ca Mon Sep 17 00:00:00 2001
From: Saverio Miroddi <saverio.pub2@gmail.com>
Date: Mon, 14 Jun 2021 11:34:33 +0200
Subject: [PATCH 2/3] Fix /boot mounts mess (part 1: timeout)

---
 install-zfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-zfs.sh b/install-zfs.sh
index 136a251..27ba7e7 100755
--- a/install-zfs.sh
+++ b/install-zfs.sh
@@ -1385,7 +1385,7 @@ function prepare_fstab {
       local mountpoint=/boot/efi$((i + 1))
     fi
 
-    chroot_execute "echo /dev/disk/by-uuid/$(blkid -s UUID -o value "${v_selected_disks[i]}"-part1) $mountpoint vfat nofail 0 0 >> /etc/fstab"
+    chroot_execute "echo /dev/disk/by-uuid/$(blkid -s UUID -o value "${v_selected_disks[i]}"-part1) $mountpoint vfat nofail,x-systemd.device-timeout=10 0 0 >> /etc/fstab"
   done
 
   if (( v_swap_size > 0 )); then

From e93521b330f72f16f1d4abaa4248400b3ac467cb Mon Sep 17 00:00:00 2001
From: Saverio Miroddi <saverio.pub2@gmail.com>
Date: Mon, 14 Jun 2021 12:25:11 +0200
Subject: [PATCH 3/3] Fix /boot mounts mess (part 2: /boot dependency)

---
 install-zfs.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/install-zfs.sh b/install-zfs.sh
index 27ba7e7..0f2ebad 100755
--- a/install-zfs.sh
+++ b/install-zfs.sh
@@ -1385,7 +1385,7 @@ function prepare_fstab {
       local mountpoint=/boot/efi$((i + 1))
     fi
 
-    chroot_execute "echo /dev/disk/by-uuid/$(blkid -s UUID -o value "${v_selected_disks[i]}"-part1) $mountpoint vfat nofail,x-systemd.device-timeout=10 0 0 >> /etc/fstab"
+    chroot_execute "echo /dev/disk/by-uuid/$(blkid -s UUID -o value "${v_selected_disks[i]}"-part1) $mountpoint vfat nofail,x-systemd.requires=zfs-mount.service,x-systemd.device-timeout=10 0 0 >> /etc/fstab"
   done
 
   if (( v_swap_size > 0 )); then