From 5828d54356d9e234bd871ae769c8056c1a201048 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Fri, 12 Feb 2021 19:33:46 -0800 Subject: [PATCH 1/2] 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. --- nixos/tests/installer.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 5fa4704d02b..968fd84bc77 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 = '' From 5406db08bf0939deebd1ed8d85511d4a93f2fe05 Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Thu, 18 Feb 2021 01:58:25 -0800 Subject: [PATCH 2/2] nixosTests.installer: increase EFI partition size Needed for simpleUefiGrub test to pass on aarch64 Runs out of space otherwise --- nixos/tests/installer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 968fd84bc77..a6576c87b98 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -401,9 +401,9 @@ let createPartitions = '' machine.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel gpt" - + " mkpart ESP fat32 1M 50MiB" # /boot + + " mkpart ESP fat32 1M 100MiB" # /boot + " set 1 boot on" - + " mkpart primary linux-swap 50MiB 1024MiB" + + " mkpart primary linux-swap 100MiB 1024MiB" + " mkpart primary ext2 1024MiB -1MiB", # / "udevadm settle", "mkswap /dev/vda2 -L swap",