Merge mainline into newreloc. For now without boot tests

tests/util/grub-shell.in

@@ -1,4 +1,4 @@
-#! /bin/bash -e
+#! /bin/sh -e
 
 # Run GRUB script in a Qemu instance
 # Copyright (C) 2009,2010  Free Software Foundation, Inc.
@@ -106,7 +106,7 @@ done
 
 if [ "x${source}" = x ] ; then
     tmpfile=`mktemp`
-    while read; do
+    while read REPLY; do
 	echo $REPLY >> ${tmpfile}
     done
     source=${tmpfile}
@@ -134,7 +134,7 @@ halt
 EOF
 
 isofile=`mktemp`
-grub-mkrescue --output=${isofile} --override-directory=${builddir} \
+sh @builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} --override-directory=${builddir}/grub-core \
     --rom-directory="${rom_directory}" \
     /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
     ${files} >/dev/null 2>&1