From d500ed127e737cf1dd40e54e79fa0fe4f160da5b Mon Sep 17 00:00:00 2001 From: Robert Millan Date: Mon, 28 Jun 2010 23:52:03 +0200 Subject: [PATCH] 2010-06-28 Robert Millan * 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. --- ChangeLog | 6 ++++++ util/grub-mkconfig.in | 5 +++-- util/grub.d/00_header.in | 9 +++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7d301dcc..59c94a44e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-06-28 Robert Millan + + * 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 * docs/grub.texi (Device map): New section. diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in index 5548da4da..e417b4352 100644 --- 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 8040a7c9b..8186ffd2d 100644 --- 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