From: BVK Chaitanya <bvk.groups@gmail.com>
Date: Wed, 19 May 2010 09:01:43 +0000 (+0530)
Subject: 	Fix grub-mkrescue usage unit testing.
X-Git-Tag: 1.99~889
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=123b7a8571689a1227f18102546b4a1413f275d7;p=thirdparty%2Fgrub.git

	Fix grub-mkrescue usage unit testing.

	* tests/util/grub-shell.in: Use --grub-mkimage with grub-mkrescue.
---

diff --git a/ChangeLog b/ChangeLog
index 46d9e7c34..53a664d2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-19  BVK Chaitanya  <bvk.groups@gmail.com>
+
+	Fix grub-mkrescue usage unit testing.
+
+	* tests/util/grub-shell.in: Use --grub-mkimage with grub-mkrescue.
+
 2010-05-18  Christian Franke  <franke@computer.org>
 
 	* util/grub.d/10_windows.in: Use path names instead of
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index a41a6f6f4..17da6c8c0 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -124,7 +124,8 @@ halt
 EOF
 
 isofile=`mktemp`
-grub-mkrescue --output=${isofile} --override-directory=${builddir} \
+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