2010-06-28 Robert Millan <rmh@gnu.org>

	* util/grub-mkconfig.in: Export `GRUB_BADRAM' variable.
	* util/grub.d/00_header.in: When `GRUB_BADRAM' is set, issue badram
	command using ${GRUB_BADRAM} as parameter.

diff --git a/ChangeLog b/ChangeLog
index c7d301dccae7c75561459999d70daf71435135b2..59c94a44e875b9a456a625a44729dc4f0207821f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-06-28  Robert Millan  <rmh@gnu.org>
+
+       * util/grub-mkconfig.in: Export `GRUB_BADRAM' variable.
+       * util/grub.d/00_header.in: When `GRUB_BADRAM' is set, issue badram
+       command using ${GRUB_BADRAM} as parameter.
+
 2010-06-28  Colin Watson  <cjwatson@ubuntu.com>
 
        * docs/grub.texi (Device map): New section.

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 5548da4dab35ebe5bc57f9bc8438ab3fe97d35c8..e417b4352a85b03624298af11730febb074b6f8e 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -1,7 +1,7 @@
 #! /bin/sh -e
 
 # Generate grub.cfg by inspecting /boot contents.
-# Copyright (C) 2006,2007,2008,2009 Free Software Foundation, Inc.
+# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
 #
 # GRUB is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -274,7 +274,8 @@ export GRUB_DEFAULT \
   GRUB_GFXPAYLOAD_LINUX \
   GRUB_DISABLE_OS_PROBER \
   GRUB_INIT_TUNE \
-  GRUB_SAVEDEFAULT
+  GRUB_SAVEDEFAULT \
+  GRUB_BADRAM
 
 if test "x${grub_cfg}" != "x"; then
   rm -f ${grub_cfg}.new

diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
index 8040a7c9b4116142b84e08006cbfb4a5309c8e2f..8186ffd2d6c1d5f71d92da2a6b86b053c8e263c0 100644 (file)
--- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in
@@ -255,8 +255,9 @@ fi
 
 # Play an initial tune
 if [ "x${GRUB_INIT_TUNE}" != "x" ] ; then
-  cat << EOF
-insmod play
-play ${GRUB_INIT_TUNE}
-EOF
+  echo "play ${GRUB_INIT_TUNE}"
+fi
+
+if [ "x${GRUB_BADRAM}" != "x" ] ; then
+  echo "badram ${GRUB_BADRAM}"
 fi