diff options
| author | Vladimir Serbinenko <phcoder@gmail.com> | 2016-01-07 15:54:42 +0100 |
|---|---|---|
| committer | Vladimir Serbinenko <phcoder@gmail.com> | 2016-01-07 15:54:42 +0100 |
| commit | 44876dd64e75b47f99d574bc3db1c87db670645c (patch) | |
| tree | 43325f69182c9a84b2160e311508d8cd85594b58 /tests | |
| parent | 86e3b4ba1af430c8d58598876b714eb99c5f535f (diff) | |
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.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/util/grub-shell.in | 3 |
1 files changed, 2 insertions, 1 deletions
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 <<EOF >>${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} |