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

video: skip 'text' gfxpayload if not supported, to fallback to default

Browse source 
On UEFI, 'text' gfxpayload is not supported, but we still reach parse_modespec()
with it, which will obviously fail. Fortunately, whatever gfxpayload is set,
we still still have the 'auto' default to fall back to. Allow getting to this
fallback by not trying to parse 'text' as a modespec.

This is because 'text' correctly doesn't parse as a modespec, and ought to have
been ignored before we got to that point, just like it is immediately picked if
we're running on a system where 'text' is a supported video mode.

Bug: https://savannah.gnu.org/bugs/index.php?56217

Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Mathieu Trudel-Lapierre 2019-04-29 13:57:02 -04:00 committed by Daniel Kiper
parent 4ff34fefe4
commit afd6ad4297
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
grub-core/video/video.c
View file

@ -663,6 +663,8 @@ grub_video_set_mode (const char *modestring,
return GRUB_ERR_NONE; return GRUB_ERR_NONE;
} }
else
continue;
} }
err = parse_modespec (current_mode, &width, &height, &depth); err = parse_modespec (current_mode, &width, &height, &depth);