public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Ryan Burns 2021-02-12 19:33:46 -08:00
parent fe111fc679
commit 5828d54356
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
nixos/tests/installer.nix
View File

@ -325,10 +325,13 @@ let
curl curl
] ]
++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub ++ optional (bootLoader == "grub" && grubVersion == 1) pkgs.grub
++ optionals (bootLoader == "grub" && grubVersion == 2) [ ++ optionals (bootLoader == "grub" && grubVersion == 2) (let
(pkgs.grub2.override { zfsSupport = true; }) zfsSupport = lib.any (x: x == "zfs")
(pkgs.grub2_efi.override { zfsSupport = true; }) (extraInstallerConfig.boot.supportedFilesystems or []);
]; in [
(pkgs.grub2.override { inherit zfsSupport; })
(pkgs.grub2_efi.override { inherit zfsSupport; })
]);
nix.binaryCaches = mkForce [ ]; nix.binaryCaches = mkForce [ ];
nix.extraOptions = '' nix.extraOptions = ''