From 918edf861247b7712979374fc15c594eb78f889c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Tue, 10 Apr 2012 22:20:20 +0000
Subject: [PATCH] I think this makes the memtest module work on grub1. But I
 can't test it because grub-install fails for me for grub1.

I tested it works for grub2.


svn path=/nixos/trunk/; revision=33739
---
 modules/installer/grub/memtest.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/installer/grub/memtest.nix b/modules/installer/grub/memtest.nix
index cdb5d10e1f0..08eb8a1f41c 100644
--- a/modules/installer/grub/memtest.nix
+++ b/modules/installer/grub/memtest.nix
@@ -19,11 +19,16 @@ in
   };
 
   config.boot.loader.grub = mkIf isEnabled {
-    extraEntries = 
+    extraEntries = if config.boot.loader.grub.version == 2 then
       ''
         menuentry "${memtest86.name}" {
           linux16 $bootRoot/memtest.bin
         }
+      ''
+      else
+      ''
+        menuentry "${memtest86.name}"
+          linux16 $bootRoot/memtest.bin
       '';
     extraPrepareConfig =
       ''