From 613b1b2c586be4b77e0e4f536e800c8213e4a8fc Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 13:44:39 +0200
Subject: [PATCH 1/2] Include /grub.cfg

---
 util/grub-mkrescue.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/util/grub-mkrescue.in b/util/grub-mkrescue.in
index 9b319ac27..4f151ac98 100644
--- a/util/grub-mkrescue.in
+++ b/util/grub-mkrescue.in
@@ -165,6 +165,7 @@ if test -e "${coreboot_dir}" ; then
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
 search --fs-uuid --set ${iso_uuid}
 set prefix=(\${root})/boot/grub/${target_cpu}-coreboot
+source $prefix/grub.cfg
 EOF
     (for i in ${modules} ; do
         echo "insmod $i"
@@ -221,6 +222,7 @@ if test -e "${efi64_dir}" ; then
     cat << EOF > ${memdisk_dir}/boot/grub/grub.cfg
 search --fs-uuid --set ${iso_uuid}
 set prefix=(\${root})/boot/grub/${target_cpu}-efi
+source $prefix/grub.cfg
 EOF
 
     tar -C ${memdisk_dir} -cf ${memdisk_img} boot

From d534028780bc8aa39231a3d10ef811322feda2b8 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Tue, 27 Apr 2010 13:45:08 +0200
Subject: [PATCH 2/2] Remove debugging leftovers

---
 tests/util/grub-shell.in | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 1ff562096..d8ea588a7 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -146,9 +146,8 @@ if [ x$boot = xfd ]; then
     bootdev=a
 fi
 
-echo ${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev}
-#${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
-#rm -f ${isofile}
+${qemu} ${qemuopts} -nographic -serial file:/dev/stdout -monitor file:/dev/null -${device} ${isofile} -boot ${bootdev} | tr -d "\r"
+rm -f ${isofile}
 
 rm -f ${tmpfile} ${cfgfile}
 exit 0