]> git.ipfire.org Git - thirdparty/grub.git/commitdiff
grub-shell: On i386-ieee1275 don't try to switch to console.
authorVladimir Serbinenko <phcoder@gmail.com>
Thu, 7 Jan 2016 14:54:42 +0000 (15:54 +0100)
committerVladimir Serbinenko <phcoder@gmail.com>
Thu, 7 Jan 2016 14:54:42 +0000 (15:54 +0100)
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

index 884c823d83ff7e638780d75cfbc95eb9626758c8..040ef04cd9c78a182411999b61bd5ee7a569fa58 100644 (file)
@@ -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}