From 849d136aa63f84cf197f9996b8df5d0a61cadff6 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:37:54 +0000
Subject: [PATCH] Making also the system-tarball-pc show the memtest entry as
 the pkgs.memtest86.name.

svn path=/nixos/trunk/; revision=33693
---
 modules/installer/cd-dvd/system-tarball-pc.nix | 2 +-
 modules/installer/grub/memtest.nix             | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/modules/installer/cd-dvd/system-tarball-pc.nix b/modules/installer/cd-dvd/system-tarball-pc.nix
index 04dec697a1b..c1a73856887 100644
--- a/modules/installer/cd-dvd/system-tarball-pc.nix
+++ b/modules/installer/cd-dvd/system-tarball-pc.nix
@@ -32,7 +32,7 @@ let
       append initrd=initrd ip=dhcp nfsroot=/home/pcroot systemConfig=${config.system.build.toplevel} init=${config.system.build.toplevel}/init
 
     label memtest
-      MENU LABEL ^Memtest86+
+      MENU LABEL ^${pkgs.memtest86.name}
       KERNEL memtest
   '';
 
diff --git a/modules/installer/grub/memtest.nix b/modules/installer/grub/memtest.nix
index f89f5834284..cdb5d10e1f0 100644
--- a/modules/installer/grub/memtest.nix
+++ b/modules/installer/grub/memtest.nix
@@ -1,10 +1,11 @@
-# This module allows getting memtest86+ in grub menus.
+# This module allows getting memtest86 in grub menus.
 
 {config, pkgs, ...}:
 
 with pkgs.lib;
 let
   isEnabled = config.boot.loader.grub.memtest86;
+  memtest86 = pkgs.memtest86;
 in
 {
   options = {
@@ -20,13 +21,13 @@ in
   config.boot.loader.grub = mkIf isEnabled {
     extraEntries = 
       ''
-        menuentry "${pkgs.memtest86.name}" {
+        menuentry "${memtest86.name}" {
           linux16 $bootRoot/memtest.bin
         }
       '';
     extraPrepareConfig =
       ''
-        cp ${pkgs.memtest86}/memtest.bin /boot/memtest.bin;
+        cp ${memtest86}/memtest.bin /boot/memtest.bin;
       '';
   };
 }