From 0c97db3b8040bfbcdaf2af2c7a76361f8f8a4bcd Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Mon, 2 Nov 2009 00:16:02 +0100
Subject: [PATCH] Fix the 'Memtest86+ bootentry doesn't work within GRUB2'
 issue.

---
 debian/changelog             | 6 ++++++
 grml-live                    | 2 +-
 templates/boot/grub/grub.cfg | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e94259a..b5840d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+grml-live (0.9.31) UNRELEASED; urgency=low
+
+  * Fix the 'Memtest86+ bootentry doesn't work within GRUB2' issue.
+
+ -- Michael Prokop <mika@grml.org>  Mon, 02 Nov 2009 00:05:22 +0100
+
 grml-live (0.9.30) unstable; urgency=low
 
   [ Michael Prokop ]
diff --git a/grml-live b/grml-live
index bef4997..fe21e5a 100755
--- a/grml-live
+++ b/grml-live
@@ -23,7 +23,7 @@ fi
 set -e
 
 # global variables
-GRML_LIVE_VERSION='0.9.30'
+GRML_LIVE_VERSION='0.9.31-pre1'
 PN="$(basename $0)"
 CMDLINE="$0 $@"
 SOURCES_LIST_FILE='/etc/grml/fai/apt/sources.list'
diff --git a/templates/boot/grub/grub.cfg b/templates/boot/grub/grub.cfg
index c225511..8bb254f 100644
--- a/templates/boot/grub/grub.cfg
+++ b/templates/boot/grub/grub.cfg
@@ -24,7 +24,7 @@ menuentry "%GRML_NAME% - release %VERSION% (default)" {
 }
 
 menuentry "Memory test (memtest86+)" {
-    linux   /boot/addons/memtest
+    linux16 /boot/addons/memtest
 }
 
 menuentry "Grub - all in one image" {
-- 
2.1.4