From ce99e2aa18b5f2f86ffd7150dc417dad891eae70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 22 Mar 2024 07:26:19 +0100 Subject: [PATCH] amazon: make fileSystems option disko-compatible When using disko, the user can choose their own filesystem layout. In that case we don't want to specify fileSystems with normal priority as it would not allow disko to set its own values. --- nixos/modules/virtualisation/amazon-image.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/amazon-image.nix b/nixos/modules/virtualisation/amazon-image.nix index f6d8848816d4..ed12029fc5c7 100644 --- a/nixos/modules/virtualisation/amazon-image.nix +++ b/nixos/modules/virtualisation/amazon-image.nix @@ -28,13 +28,13 @@ in boot.growPartition = true; - fileSystems."/" = mkIf (!cfg.zfs.enable) { + fileSystems."/" = mkIf (!cfg.zfs.enable) lib.mkDefault { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; autoResize = true; }; - fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) { + fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) lib.mkDefault { # The ZFS image uses a partition labeled ESP whether or not we're # booting with EFI. device = "/dev/disk/by-label/ESP";