From b098765485cd43eaf2def11b4e213ef40e1c2d6e Mon Sep 17 00:00:00 2001
From: Alejandro Angulo <iam@alejandr0angul0.dev>
Date: Thu, 6 Apr 2023 19:34:49 -0700
Subject: [PATCH] Removed extraneous mounts

Mounts are already happening due to config in associated
hardware-configuration files.
---
 systems/x86_64-linux/carbon/zfs.nix |  6 ------
 systems/x86_64-linux/gospel/zfs.nix | 18 ------------------
 2 files changed, 24 deletions(-)

diff --git a/systems/x86_64-linux/carbon/zfs.nix b/systems/x86_64-linux/carbon/zfs.nix
index 429825c..5329c0a 100644
--- a/systems/x86_64-linux/carbon/zfs.nix
+++ b/systems/x86_64-linux/carbon/zfs.nix
@@ -34,12 +34,6 @@
     grub.copyKernels = true;
     grub.efiSupport = true;
     grub.zfsSupport = true;
-    # for systemd-autofs
-    grub.extraPrepareConfig = ''
-      mkdir -p /boot/efis /boot/efi
-      for i in  /boot/efis/*; do mount $i ; done
-      mount /boot/efi
-    '';
     grub.extraInstallCommands = ''
       export ESP_MIRROR=$(mktemp -d -p /tmp)
       cp -r /boot/efis/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085-part1/EFI $ESP_MIRROR
diff --git a/systems/x86_64-linux/gospel/zfs.nix b/systems/x86_64-linux/gospel/zfs.nix
index a7dd9a4..4b522d6 100644
--- a/systems/x86_64-linux/gospel/zfs.nix
+++ b/systems/x86_64-linux/gospel/zfs.nix
@@ -15,24 +15,6 @@
   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 | grep -q "$i")
-      isDirectoryMounted=$?
-      if (test $isDirectoryMounted -ne 0); then
-        mount "$i"
-      fi
-    done
-
-    mkdir -p /boot/efi
-    # mount /boot/efi
-    (mount | grep -q /boot/efi)
-    isDirectoryMounted=$?
-    if (test $isDirectoryMounted -ne 0); then
-      mount /boot/efi
-    fi
-  '';
   boot.loader.grub.extraInstallCommands = ''
     ESP_MIRROR=$(mktemp -d)
     cp -r /boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1/EFI $ESP_MIRROR