* grub-core/loader/multiboot.c (grub_multiboot_set_console): Always use

video if no text is available.

	Also-By: Vladimir Serbinenko <phcoder@gmail.com>
This commit is contained in:
neil 2013-09-23 13:35:33 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 1bd7302506
commit 71764dc8ca
2 changed files with 15 additions and 2 deletions

View file

@ -1,3 +1,9 @@
2013-09-23 Vladimir Serbinenko <phcoder@gmail.com>
2013-09-23 neil
* grub-core/loader/multiboot.c (grub_multiboot_set_console): Always use
video if no text is available.
2013-09-23 Vladimir Serbinenko <phcoder@gmail.com> 2013-09-23 Vladimir Serbinenko <phcoder@gmail.com>
2013-09-23 neil 2013-09-23 neil

View file

@ -216,8 +216,15 @@ grub_multiboot_set_console (int console_type, int accepted_consoles,
grub_env_set ("gfxpayload", buf); grub_env_set ("gfxpayload", buf);
grub_free (buf); grub_free (buf);
} }
else else
grub_env_set ("gfxpayload", "text"); {
#if GRUB_MACHINE_HAS_VGA_TEXT
grub_env_set ("gfxpayload", "text");
#else
/* Always use video if no VGA text is available. */
grub_env_set ("gfxpayload", "auto");
#endif
}
accepts_video = !!(accepted_consoles & GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER); accepts_video = !!(accepted_consoles & GRUB_MULTIBOOT_CONSOLE_FRAMEBUFFER);
accepts_ega_text = !!(accepted_consoles & GRUB_MULTIBOOT_CONSOLE_EGA_TEXT); accepts_ega_text = !!(accepted_consoles & GRUB_MULTIBOOT_CONSOLE_EGA_TEXT);