vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* tests/util/grub-shell.in: Set pkgdatadir when calling grub-mkrescue

Browse source 
and grub-mknetdir.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-11 22:43:15 +02:00
parent 9bab65c49d
commit 16fc9293d6
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-04-11 Vladimir Serbinenko <phcoder@gmail.com>
* tests/util/grub-shell.in: Set pkgdatadir when calling grub-mkrescue
and grub-mknetdir.
2012-04-11 Vladimir Serbinenko <phcoder@gmail.com> 2012-04-11 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/linux.c (grub_cmd_linux): Avoid accessing * grub-core/loader/i386/linux.c (grub_cmd_linux): Avoid accessing

4
tests/util/grub-shell.in
View file

@ -138,7 +138,7 @@ EOF
isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
if [ x$boot != xnet ]; then if [ x$boot != xnet ]; then
sh "@builddir@/grub-mkrescue" "--grub-mkimage=${builddir}/grub-mkimage" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \ pkgdatadir="@builddir@" sh "@builddir@/grub-mkrescue" "--grub-mkimage=${builddir}/grub-mkimage" "--output=${isofile}" "--override-directory=${builddir}/grub-core" \
--rom-directory="${rom_directory}" \ --rom-directory="${rom_directory}" \
"/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \ "/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \
${files} >/dev/null 2>&1 ${files} >/dev/null 2>&1
@ -171,7 +171,7 @@ fi
if [ x$boot = xnet ]; then if [ x$boot = xnet ]; then
netdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1 netdir=`mktemp -d "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
sh "@builddir@/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--override-directory=${builddir}/grub-core" "--net-directory=$netdir" pkgdatadir="@builddir@" sh "@builddir@/grub-mknetdir" "--grub-mkimage=${builddir}/grub-mkimage" "--override-directory=${builddir}/grub-core" "--net-directory=$netdir"
cp "${cfgfile}" "$netdir/boot/grub/grub.cfg" cp "${cfgfile}" "$netdir/boot/grub/grub.cfg"
cp "${source}" "$netdir/boot/grub/testcase.cfg" cp "${source}" "$netdir/boot/grub/testcase.cfg"
. "${builddir}/grub-core/modinfo.sh" . "${builddir}/grub-core/modinfo.sh"