Commit 48a6b898 authored by Luna Nova's avatar Luna Nova Committed by K900
Browse files

nixos/grub: use new combined memtest86plus binary 

memtest86plus puts the path to the binary at a passthru attr

after memtest86plus 8 there's a single combined EFI+legacy file
parent ecd17836

nixos/modules/system/boot/loader/grub/grub.nix

+1 −1
Original line number Diff line number Diff line
@@ -472,7 +472,7 @@ in 
        type = types.attrsOf types.path;

        default = { };

        example = literalExpression ''

          { "memtest.bin" = "''${pkgs.memtest86plus}/memtest.bin"; }

          { "memtest.bin" = pkgs.memtest86plus.efi; }

        '';

        description = ''

          A set of files to be copied to {file}`/boot`.

nixos/modules/system/boot/loader/grub/memtest.nix

+1 −1
Original line number Diff line number Diff line
@@ -69,6 +69,6 @@ in 
        linux @bootRoot@/memtest.bin ${toString cfg.params}

      }

    '';

    boot.loader.grub.extraFiles."memtest.bin" = "${memtest86}/memtest.bin";

    boot.loader.grub.extraFiles."memtest.bin" = memtest86.efi;

  };

}