From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Tue, 1 Jun 2010 03:42:01 +0000 (+0530)
Subject: pull-in emu-lite
X-Git-Tag: 1.99~647^2~62
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fe16b845572442bad3ccd098957e516bf4493e0b;p=thirdparty%2Fgrub.git

pull-in emu-lite
---

fe16b845572442bad3ccd098957e516bf4493e0b
diff --cc tests/util/grub-shell.in
index abdcaab8b,17da6c8c0..4af6a71e3
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@@ -123,15 -123,11 +123,15 @@@ source /boot/grub/testcase.cf
  halt
  EOF
  
 +rootdir=`mktemp -d`
 +(cd @abs_top_builddir@ && make DESTDIR=$rootdir install) >/dev/null 2>&1
 +
  isofile=`mktemp`
 -grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage --output=${isofile} \
 -  --override-directory=${builddir} \
 -  /boot/grub/grub.cfg=${cfgfile} /boot/grub/testcase.cfg=${source} \
 -  >/dev/null 2>&1
 +sh @abs_top_builddir@/grub-mkrescue --grub-mkimage=${builddir}/grub-mkimage \
 +  --override-directory=${builddir}/grub-core --output=${isofile} \
-   --root-directory=${rootdir} /boot/grub/grub.cfg=${cfgfile} \
++  boot/grub/grub.cfg=${cfgfile} \
 +  /boot/grub/testcase.cfg=${source} >/dev/null 2>&1
 +rm -rf $rootdir
  
  hdafile=`mktemp`
  cp ${isofile} ${hdafile}