From f0fd1c9bcfd745d3576dc8ca1357ad458a522fc2 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Wed, 21 Jan 2015 14:00:18 +0100
Subject: [PATCH] nixos: iso-image: use memtest86 params in syslinux

See also #6593.
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index c41d22ffd0d..87e8fabe273 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -46,6 +46,13 @@ let
     INITRD /boot/initrd
     '';
 
+  isolinuxMemtest86Entry = ''
+    LABEL memtest
+    MENU LABEL Memtest86+
+    LINUX /boot/memtest.bin
+    APPEND ${toString config.boot.loader.grub.memtest86.params}
+  '';
+
   isolinuxCfg = baseIsolinuxCfg + (optionalString config.boot.loader.grub.memtest86.enable isolinuxMemtest86Entry);
 
   # The efi boot image
@@ -289,6 +296,10 @@ in
         { source = "${efiDir}/loader";
           target = "/loader";
         }
+      ] ++ optionals config.boot.loader.grub.memtest86.enable [
+        { source = "${pkgs.memtest86plus}/memtest.bin";
+          target = "/boot/memtest.bin";
+        }
       ];
 
     boot.loader.timeout = 10;