From ac9bfd3fd7dbd9ca90afefd20e3c51750ef61a57 Mon Sep 17 00:00:00 2001 From: Mark Nipper Date: Tue, 7 May 2024 19:19:45 -0700 Subject: Fix ESP mounts --- hosts/darkstar/default.nix | 2 -- hosts/darkstar/hardware-configuration.nix | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'hosts/darkstar') diff --git a/hosts/darkstar/default.nix b/hosts/darkstar/default.nix index 556c7c5..4d9dbff 100644 --- a/hosts/darkstar/default.nix +++ b/hosts/darkstar/default.nix @@ -10,8 +10,6 @@ systemd-boot = { enable = true; extraInstallCommands = '' - ${pkgs.util-linux}/bin/mount -t vfat -o iocharset=iso8859-1 /dev/disk/by-label/ESP1 /efiboot/efi1 - ${pkgs.util-linux}/bin/mount -t vfat -o iocharset=iso8859-1 /dev/disk/by-label/ESP2 /efiboot/efi2 ${pkgs.coreutils}/bin/cp -r /efiboot/efi1/* /efiboot/efi2 ''; }; diff --git a/hosts/darkstar/hardware-configuration.nix b/hosts/darkstar/hardware-configuration.nix index 3acea79..49cc244 100644 --- a/hosts/darkstar/hardware-configuration.nix +++ b/hosts/darkstar/hardware-configuration.nix @@ -18,6 +18,12 @@ fsType = "zfs"; }; + fileSystems."/efiboot/efi1" = + { device = "/dev/disk/by-label/ESP1"; + fsType = "vfat"; + options = [ "X-mount.mkdir" "iocharset=iso8859-1" ]; + }; + fileSystems."/efiboot/efi2" = { device = "/dev/disk/by-label/ESP2"; fsType = "vfat"; -- cgit v1.2.3