vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

grub-shell: On i386-ieee1275 don't try to switch to console.

Browse source 
console goes to serial as well, so this doesn't stop garbage from going
to serial. But it creates garbage itself.
This commit is contained in:
Vladimir Serbinenko 2016-01-07 15:54:42 +01:00
parent 86e3b4ba1a
commit 44876dd64e
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tests/util/grub-shell.in
View file

@ -331,7 +331,8 @@ cat <<EOF >>${cfgfile}
source "\$prefix/testcase.cfg" source "\$prefix/testcase.cfg"
# Stop serial output to suppress "ACPI shutdown failed" error. # Stop serial output to suppress "ACPI shutdown failed" error.
EOF 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} echo "terminal_output $console" >>${cfgfile}
fi fi
echo "${halt_cmd}" >>${cfgfile} echo "${halt_cmd}" >>${cfgfile}