From 44876dd64e75b47f99d574bc3db1c87db670645c Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Thu, 7 Jan 2016 15:54:42 +0100 Subject: [PATCH] grub-shell: On i386-ieee1275 don't try to switch to console. console goes to serial as well, so this doesn't stop garbage from going to serial. But it creates garbage itself. --- tests/util/grub-shell.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in index 884c823d8..040ef04cd 100644 --- a/tests/util/grub-shell.in +++ b/tests/util/grub-shell.in @@ -331,7 +331,8 @@ cat <>${cfgfile} source "\$prefix/testcase.cfg" # Stop serial output to suppress "ACPI shutdown failed" error. EOF -if [ x$console != x ]; then +# Attempt to switch to console on i386-ieee1275 causes "screen not found" message +if [ x$console != x ] && [ x"${grub_modinfo_target_cpu}-${grub_modinfo_platform}" != xi386-ieee1275 ]; then echo "terminal_output $console" >>${cfgfile} fi echo "${halt_cmd}" >>${cfgfile}