From 11c527ed274aa70a42c4fef4bc05bcfd8807065d Mon Sep 17 00:00:00 2001
From: Maurice Zhou <jasper@apvc.uk>
Date: Tue, 15 Feb 2022 13:12:07 +0100
Subject: [PATCH] NixOS Root on ZFS: replace /boot/efi with primary disk esp

/boot/efi is used exclusively to mirror EFI contents to
other disks, as in `cp /boot/efi/EFI /boot/efis/disk{0,1,2}`

As shown in issue #256, this approach causes trouble with
`nixos-generate-config`, which fills filesystem type as 'none'.

This commit fixes this issue by removing /boot/efi mountpoint and
directly copy from '/boot/efis/primary-disk/EFI/'.

Closes #256

Signed-off-by: Maurice Zhou <jasper@apvc.uk>
---
 .../NixOS/Root on ZFS/2-system-configuration.rst       | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/docs/Getting Started/NixOS/Root on ZFS/2-system-configuration.rst b/docs/Getting Started/NixOS/Root on ZFS/2-system-configuration.rst
index c5b30a5..c54fecc 100644
--- a/docs/Getting Started/NixOS/Root on ZFS/2-system-configuration.rst	
+++ b/docs/Getting Started/NixOS/Root on ZFS/2-system-configuration.rst	
@@ -217,8 +217,6 @@ System Configuration
      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 ${INST_PRIMARY_DISK}-part1 /mnt/boot/efi
 
 #. Create optional user data datasets to omit data from rollback::
 
@@ -314,6 +312,7 @@ System Configuration
       environment.etc."machine-id".source = "/state/etc/machine-id";
       environment.etc."zfs/zpool.cache".source
         = "/state/etc/zfs/zpool.cache";
+      boot.loader.efi.efiSysMountPoint = "/boot/efis/${INST_PRIMARY_DISK##*/}-part1";
     EOF
 
 #. Configure GRUB boot loader for both legacy boot and UEFI::
@@ -327,7 +326,6 @@ System Configuration
         efi.canTouchEfiVariables = false;
         ##if UEFI firmware can detect entries
         #efi.canTouchEfiVariables = true;
-        efi.efiSysMountPoint = "/boot/efi";
         grub.enable = true;
         grub.version = 2;
         grub.copyKernels = true;
@@ -341,7 +339,11 @@ System Configuration
         '';
         grub.extraInstallCommands = ''
            export ESP_MIRROR=$(mktemp -d -p /tmp)
-           cp -r /boot/efi/EFI $ESP_MIRROR
+    EOF
+    tee -a /mnt/etc/nixos/${INST_CONFIG_FILE} <<EOF
+           cp -r /boot/efis/${INST_PRIMARY_DISK##*/}-part1/EFI \$ESP_MIRROR
+    EOF
+    tee -a /mnt/etc/nixos/${INST_CONFIG_FILE} <<-'EOF'
            for i in /boot/efis/*; do
             cp -r $ESP_MIRROR/EFI $i
            done