From 9017ccf9fea31a2a1d57560792ee86181daf39bf 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:36:26 +0000
Subject: [PATCH] Removing the special memtest.nix module for the isos, and
 using the same as the usual nixos. I think this trivial change works; I
 checked the grub.cfg output generated in the iso_minimal.

svn path=/nixos/trunk/; revision=33692
---
 .../installer/cd-dvd/installation-cd-base.nix |  5 ++--
 modules/installer/cd-dvd/memtest.nix          | 27 -------------------
 2 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 modules/installer/cd-dvd/memtest.nix

diff --git a/modules/installer/cd-dvd/installation-cd-base.nix b/modules/installer/cd-dvd/installation-cd-base.nix
index ac38934d4013..47e8a1013541 100644
--- a/modules/installer/cd-dvd/installation-cd-base.nix
+++ b/modules/installer/cd-dvd/installation-cd-base.nix
@@ -30,8 +30,7 @@ in
 
 {
   require =
-    [ ./memtest.nix
-      ./iso-image.nix
+    [ ./iso-image.nix
 
       # Profiles of this basic installation CD.
       ../../profiles/all-hardware.nix
@@ -67,6 +66,8 @@ in
      echo 1 > /proc/sys/vm/overcommit_memory
     '';
 
+  boot.loader.grub.memtest86 = true;
+
   # To speed up installation a little bit, include the complete stdenv
   # in the Nix store on the CD.
   isoImage.storeContents = [ pkgs.stdenv pkgs.klibc pkgs.klibcShrunk ];
diff --git a/modules/installer/cd-dvd/memtest.nix b/modules/installer/cd-dvd/memtest.nix
deleted file mode 100644
index 6494c6966117..000000000000
--- a/modules/installer/cd-dvd/memtest.nix
+++ /dev/null
@@ -1,27 +0,0 @@
-# This module adds Memtest86 to the Grub boot menu on the CD.  !!! It
-# would be nice if this also worked for normal configurations.
-
-{config, pkgs, ...}:
-
-let
-
-  memtestPath = "/boot/memtest.bin";
-
-  memtest86 = pkgs.memtest86;
-
-in
-
-{
-  boot.loader.grub.extraEntries =
-    ''
-      menuentry "${memtest86.name}" {
-        linux16 ${memtestPath}
-      }
-    '';
-
-  isoImage.contents =
-    [ { source = memtest86 + "/memtest.bin";
-        target = memtestPath;
-      }
-    ];
-}