Blob Blame Raw
From 47af30033ffebe7e3fa55fe430d95241ccc46b6c Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Fri, 12 Apr 2013 14:52:05 +0200
Subject: [PATCH 287/364] 	* tests/util/grub-shell.in: Fix it on powerpc.

---
 ChangeLog                | 4 ++++
 tests/util/grub-shell.in | 9 +++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1c77abf..109bb4c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 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
 	anymore.
 
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index c6d1cd7..e467b4a 100644
--- 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
-- 
1.8.1.4