diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2021-02-12 19:33:46 -0800 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2021-02-12 19:39:17 -0800 |
| commit | 5828d54356d9e234bd871ae769c8056c1a201048 (patch) | |
| tree | 2ba26948a6e1090fc014b065f60ead78fa46c801 /nixos/tests | |
| parent | fe111fc67937c22ffc84e4466f494366583124b7 (diff) | |
nixosTests.installer: fix non-zfs grub tests
Now that grub2 is built without zfs support when possible, this is a separate store path which may need to be made available to the installer.
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/installer.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 5fa4704d02b6a..968fd84bc7747 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -325,10 +325,13 @@ let curl ] ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub - ++ optionals (bootLoader == "grub" && grubVersion == 2) [ - (pkgs.grub2.override { zfsSupport = true; }) - (pkgs.grub2_efi.override { zfsSupport = true; }) - ]; + ++ optionals (bootLoader == "grub" && grubVersion == 2) (let + zfsSupport = lib.any (x: x == "zfs") + (extraInstallerConfig.boot.supportedFilesystems or []); + in [ + (pkgs.grub2.override { inherit zfsSupport; }) + (pkgs.grub2_efi.override { inherit zfsSupport; }) + ]); nix.binaryCaches = mkForce [ ]; nix.extraOptions = '' |