diff options
| author | enc0urage <127197575+enc0urage@users.noreply.github.com> | 2023-04-18 08:39:38 +0000 |
|---|---|---|
| committer | enc0urage <127197575+enc0urage@users.noreply.github.com> | 2023-08-14 03:05:24 +0000 |
| commit | 00d7065913ad9f51d3fd494c24a78bea5f408771 (patch) | |
| tree | 13e28527b3935a81d93da0140a96f9596581679a /nixos/tests/systemd-boot.nix | |
| parent | 1488a2bc1a15f4f7fd6e2a756f1e1f104036fcf7 (diff) | |
nixos/systemd-boot: Replace proprietary memtest86 with free memtest86+ in UEFI
Diffstat (limited to 'nixos/tests/systemd-boot.nix')
| -rw-r--r-- | nixos/tests/systemd-boot.nix | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index 84a4da5aa6ec5..c1f8637989e39 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -118,14 +118,11 @@ in nodes.machine = { pkgs, lib, ... }: { imports = [ common ]; boot.loader.systemd-boot.memtest86.enable = true; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "memtest86-efi" - ]; }; testScript = '' machine.succeed("test -e /boot/loader/entries/memtest86.conf") - machine.succeed("test -e /boot/efi/memtest86/BOOTX64.efi") + machine.succeed("test -e /boot/efi/memtest86/memtest.efi") ''; }; @@ -152,15 +149,12 @@ in imports = [ common ]; boot.loader.systemd-boot.memtest86.enable = true; boot.loader.systemd-boot.memtest86.entryFilename = "apple.conf"; - nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ - "memtest86-efi" - ]; }; testScript = '' machine.fail("test -e /boot/loader/entries/memtest86.conf") machine.succeed("test -e /boot/loader/entries/apple.conf") - machine.succeed("test -e /boot/efi/memtest86/BOOTX64.efi") + machine.succeed("test -e /boot/efi/memtest86/memtest.efi") ''; }; |