From 6e281e46b770c153f1f928494d90af17898bcc06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Mon, 9 Apr 2012 20:30:14 +0000
Subject: [PATCH] I update the name of the memtest entry in grub of the iso
 images, because it can be overriden choosing another memtest86.

As an effect of a change in nixpgks, the isos will include
memtest86 4.0a instead of memtest86+ 4.20, only because the
former is released later, and I deduce it should work better.


svn path=/nixos/trunk/; revision=33691
---
 modules/installer/cd-dvd/memtest.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/installer/cd-dvd/memtest.nix b/modules/installer/cd-dvd/memtest.nix
index 2ec35dcc8fb..6494c696611 100644
--- a/modules/installer/cd-dvd/memtest.nix
+++ b/modules/installer/cd-dvd/memtest.nix
@@ -7,18 +7,20 @@ let
 
   memtestPath = "/boot/memtest.bin";
 
+  memtest86 = pkgs.memtest86;
+
 in
 
 {
   boot.loader.grub.extraEntries =
     ''
-      menuentry "Memtest86+" {
+      menuentry "${memtest86.name}" {
         linux16 ${memtestPath}
       }
     '';
 
   isoImage.contents =
-    [ { source = pkgs.memtest86 + "/memtest.bin";
+    [ { source = memtest86 + "/memtest.bin";
         target = memtestPath;
       }
     ];