From 00d7065913ad9f51d3fd494c24a78bea5f408771 Mon Sep 17 00:00:00 2001
From: enc0urage <127197575+enc0urage@users.noreply.github.com>
Date: Tue, 18 Apr 2023 08:39:38 +0000
Subject: nixos/systemd-boot: Replace proprietary memtest86 with free
 memtest86+ in UEFI

---
 nixos/tests/systemd-boot.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'nixos/tests/systemd-boot.nix')

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")
     '';
   };
 
-- 
cgit 1.4.1