From d4ffbd73a8b4f7ddc8f082404943aaf17c0b7544 Mon Sep 17 00:00:00 2001
From: Maurice Zhou <jasper@apvc.uk>
Date: Wed, 1 Dec 2021 14:53:41 +0100
Subject: [PATCH] NixOS: fix mirrored EFI system partition issue

Signed-off-by: Maurice Zhou <jasper@apvc.uk>
---
 .../Root on ZFS/2-system-configuration.rst    | 24 ++++++++++---------
 .../Root on ZFS/3-optional-configuration.rst  |  3 +++
 .../Root on ZFS/4-system-installation.rst     |  1 +
 3 files changed, 17 insertions(+), 11 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 c603b3c..d603554 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	
@@ -227,6 +227,8 @@ 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::
 
@@ -321,7 +323,7 @@ System Configuration
 #. Configure GRUB boot loader for both legacy boot and UEFI::
 
     sed -i '/boot.loader/d' /mnt/etc/nixos/configuration.nix
-    tee -a /mnt/etc/nixos/${INST_CONFIG_FILE} <<EOF
+    tee -a /mnt/etc/nixos/${INST_CONFIG_FILE} <<-'EOF'
       boot.loader = {
         generationsDir.copyKernels = true;
         ##for problematic UEFI firmware
@@ -329,7 +331,7 @@ System Configuration
         efi.canTouchEfiVariables = false;
         ##if UEFI firmware can detect entries
         #efi.canTouchEfiVariables = true;
-        efi.efiSysMountPoint = "/boot/efis/${INST_PRIMARY_DISK##*/}-part1";
+        efi.efiSysMountPoint = "/boot/efi";
         grub.enable = true;
         grub.version = 2;
         grub.copyKernels = true;
@@ -338,21 +340,21 @@ System Configuration
         # for systemd-autofs
         grub.extraPrepareConfig = ''
           mkdir -p /boot/efis
-          for i in  /boot/efis/*; do mount \$i ; done
+          for i in  /boot/efis/*; do mount $i ; done
+        '';
+        grub.extraInstallCommands = ''
+           export ESP_MIRROR=$(mktemp -d -p /tmp)
+           cp -r /boot/efi/EFI $ESP_MIRROR
+           for i in /boot/efis/*; do
+            cp -r $ESP_MIRROR/EFI $i
+           done
+           rm -rf $ESP_MIRROR
         '';
         grub.devices = [
     EOF
     for i in $DISK; do
       printf "      \"$i\"\n" >>/mnt/etc/nixos/${INST_CONFIG_FILE}
     done
-    tee -a /mnt/etc/nixos/${INST_CONFIG_FILE} <<EOF
-        ];
-        grub.mirroredBoots = [
-    EOF
-    for i in $DISK; do
-      printf "      { devices = [ \"$i\" ] ; efiSysMountPoint = \"/boot/efis/${i##*/}-part1\"; path = \"/boot\"; }\n" \
-      >>/mnt/etc/nixos/${INST_CONFIG_FILE}
-    done
     tee -a /mnt/etc/nixos/${INST_CONFIG_FILE} <<EOF
         ];
       };
diff --git a/docs/Getting Started/NixOS/Root on ZFS/3-optional-configuration.rst b/docs/Getting Started/NixOS/Root on ZFS/3-optional-configuration.rst
index ef1dbbb..a008856 100644
--- a/docs/Getting Started/NixOS/Root on ZFS/3-optional-configuration.rst	
+++ b/docs/Getting Started/NixOS/Root on ZFS/3-optional-configuration.rst	
@@ -78,6 +78,7 @@ root pool will be replaced by keyfile, embedded in initrd.
     for i in ${DISK}; do
      umount /mnt/boot/efis/${i##*/}-part1
     done
+    umount /mnt/boot/efi
 
 #. Destroy boot pool::
 
@@ -160,6 +161,8 @@ root pool will be replaced by keyfile, embedded in initrd.
      mount ${i}-part1 /mnt/boot/efis/${i##*/}-part1
     done
 
+    mount -t vfat ${INST_PRIMARY_DISK}-part1 /mnt/boot/efi
+
 #. As keys are stored in initrd,
    set secure permissions for ``/boot``::
 
diff --git a/docs/Getting Started/NixOS/Root on ZFS/4-system-installation.rst b/docs/Getting Started/NixOS/Root on ZFS/4-system-installation.rst
index 18f78fa..e5608c0 100644
--- a/docs/Getting Started/NixOS/Root on ZFS/4-system-installation.rst	
+++ b/docs/Getting Started/NixOS/Root on ZFS/4-system-installation.rst	
@@ -75,6 +75,7 @@ Finish installation
 #. Unmount EFI system partition::
 
     umount /mnt/boot/efis/*
+    umount /mnt/boot/efi
 
 #. Export pools::