From 1211e98faf1f37af1de5eb8f3ce0a1c87f71a0e6 Mon Sep 17 00:00:00 2001
From: Maurice Zhou <ja@apvc.uk>
Date: Thu, 9 Feb 2023 15:50:22 +0100
Subject: [PATCH] NixOS Root on ZFS: Do not bind mount /boot/efi

Previously we used a bind mount from /boot/efis/*-part1
to /boot/efi to facilitate bootloader configuration.
Recent reports indicate that this bind mount prevents
the system from booting.  This pull request removes the
bind mount.

Closes #383.

Signed-off-by: Maurice Zhou <ja@apvc.uk>
---
 .../Root on ZFS/2-system-installation.rst      |  3 ---
 .../Root on ZFS/3-system-configuration.rst     | 18 +++++++++---------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/docs/Getting Started/NixOS/Root on ZFS/2-system-installation.rst b/docs/Getting Started/NixOS/Root on ZFS/2-system-installation.rst
index 8b20707..0c3ad69 100644
--- a/docs/Getting Started/NixOS/Root on ZFS/2-system-installation.rst	
+++ b/docs/Getting Started/NixOS/Root on ZFS/2-system-installation.rst	
@@ -128,6 +128,3 @@ System Installation
      mkdir -p /mnt/boot/efis/${i##*/}-part1
      mount -t vfat ${i}-part1 /mnt/boot/efis/${i##*/}-part1
     done
-
-    mkdir -p /mnt/boot/efi
-    mount -t vfat $(echo $DISK | cut -f1 -d\ )-part1 /mnt/boot/efi
diff --git a/docs/Getting Started/NixOS/Root on ZFS/3-system-configuration.rst b/docs/Getting Started/NixOS/Root on ZFS/3-system-configuration.rst
index e696390..e969d0a 100644
--- a/docs/Getting Started/NixOS/Root on ZFS/3-system-configuration.rst	
+++ b/docs/Getting Started/NixOS/Root on ZFS/3-system-configuration.rst	
@@ -28,8 +28,10 @@ System Configuration
 
     sed -i '/boot.loader/d' /mnt/etc/nixos/configuration.nix
     sed -i '/services.xserver/d' /mnt/etc/nixos/configuration.nix
+    tee -a /mnt/etc/nixos/zfs.nix <<EOF
+    boot.loader.efi.efiSysMountPoint = "/boot/efis/$(echo $DISK | cut -f1 -d\ | sed 's|/dev/disk/by-id/||')-part1";
+    EOF
     tee -a /mnt/etc/nixos/zfs.nix <<-'EOF'
-    boot.loader.efi.efiSysMountPoint = "/boot/efi";
     boot.loader.efi.canTouchEfiVariables = false;
     boot.loader.generationsDir.copyKernels = true;
     boot.loader.grub.efiInstallAsRemovable = true;
@@ -38,16 +40,9 @@ System Configuration
     boot.loader.grub.copyKernels = true;
     boot.loader.grub.efiSupport = true;
     boot.loader.grub.zfsSupport = true;
-    boot.loader.grub.extraPrepareConfig = ''
-      mkdir -p /boot/efis
-      for i in  /boot/efis/*; do mount $i ; done
-
-      mkdir -p /boot/efi
-      mount /boot/efi
-    '';
     boot.loader.grub.extraInstallCommands = ''
     ESP_MIRROR=$(mktemp -d)
-    cp -r /boot/efi/EFI $ESP_MIRROR
+    cp -r ${config.boot.loader.efi.efiSysMountPoint}/EFI $ESP_MIRROR
     for i in /boot/efis/*; do
      cp -r $ESP_MIRROR/EFI $i
     done
@@ -69,6 +64,11 @@ System Configuration
      sed -i 's|fsType = "zfs";|fsType = "zfs"; options = [ "zfsutil" "X-mount.mkdir" ];|g' \
      /mnt/etc/nixos/hardware-configuration.nix
 
+#. Mount EFI partitions on demand::
+
+     sed -i 's|fsType = "vfat";|fsType = "vfat"; options = [ "x-systemd.idle-timeout=1min" "x-systemd.automount" "noauto" "nofail" ];|g' \
+     /mnt/etc/nixos/hardware-configuration.nix
+
 #. Set root password::
 
      rootPwd=$(mkpasswd -m SHA-512 -s)