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

* tests/util/grub-shell.in: Fix it on powerpc.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-04-12 14:52:05 +02:00
parent 5121223465
commit a936af564c
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
* tests/util/grub-shell.in: Fix it on powerpc.
2013-04-12 Vladimir Serbinenko <phcoder@gmail.com> 2013-04-12 Vladimir Serbinenko <phcoder@gmail.com>
Turn off QEMU ACPI-way since new releases don't have shutdown port Turn off QEMU ACPI-way since new releases don't have shutdown port

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

@ -198,8 +198,13 @@ cfgfile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
cat <<EOF >${cfgfile} cat <<EOF >${cfgfile}
grubshell=yes grubshell=yes
insmod serial insmod serial
EOF
if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ]; then
echo insmod escc >>${cfgfile}
fi
cat <<EOF >>${cfgfile}
serial ${serial_port} serial ${serial_port}
terminfo serial_${serial_port} dumb terminfo -g 255x255 serial_${serial_port} dumb
terminal_input serial_${serial_port} terminal_input serial_${serial_port}
terminal_output serial_${serial_port} terminal_output serial_${serial_port}
EOF EOF
@ -228,7 +233,7 @@ echo "${halt_cmd}" >>${cfgfile}
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
pkgdatadir="@builddir@" 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" "--grub-render-label=${builddir}/grub-render-label" "--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