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

diff --git a/ChangeLog b/ChangeLog
index 1c77abf0e200cf43d1ae51e9a3ed0592b2baac70..109bb4c1486ad5a920b668ef6a7575236814ff6d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        Turn off QEMU ACPI-way since new releases don't have shutdown port

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index c6d1cd783eda579ea4a217c0eadbf39e73e5cf97..e467b4a770d3457dfa5b3e472a78bbf7580a618f 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -198,8 +198,13 @@ cfgfile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
 cat <<EOF >${cfgfile}
 grubshell=yes
 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}
-terminfo serial_${serial_port} dumb
+terminfo -g 255x255 serial_${serial_port} dumb
 terminal_input serial_${serial_port}
 terminal_output serial_${serial_port}
 EOF
@@ -228,7 +233,7 @@ echo "${halt_cmd}" >>${cfgfile}
 
 isofile=`mktemp "${TMPDIR:-/tmp}/tmp.XXXXXXXXXX"` || exit 1
 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}" \
        "/boot/grub/grub.cfg=${cfgfile}" "/boot/grub/testcase.cfg=${source}" \
        ${files} >/dev/null 2>&1