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

Don't accept text modes on EFI when booting Linux.

Browse source 
* grub-core/loader/i386/linux.c (ACCEPTS_PURE_TEXT): New define.
	(grub_linux_boot) [!ACCEPTS_PURE_TEXT]: Restrict to graphics modes.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-08-16 16:11:10 +02:00
parent 828bc390d8
commit b1257f6533
2 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2011-08-16 Vladimir Serbinenko <phcoder@gmail.com>
Don't accept text modes on EFI when booting Linux.
* grub-core/loader/i386/linux.c (ACCEPTS_PURE_TEXT): New define.
(grub_linux_boot) [!ACCEPTS_PURE_TEXT]: Restrict to graphics modes.
2011-08-15 Mario Limonciello <mario_limonciello@dell.com> 2011-08-15 Mario Limonciello <mario_limonciello@dell.com>
2011-08-15 Colin Watson <cjwatson@ubuntu.com> 2011-08-15 Colin Watson <cjwatson@ubuntu.com>

17
grub-core/loader/i386/linux.c
View file

@ -45,15 +45,18 @@ GRUB_MOD_LICENSE ("GPLv3+");
#include <grub/efi/efi.h> #include <grub/efi/efi.h>
#define HAS_VGA_TEXT 0 #define HAS_VGA_TEXT 0
#define DEFAULT_VIDEO_MODE "auto" #define DEFAULT_VIDEO_MODE "auto"
#define ACCEPTS_PURE_TEXT 0
#elif defined (GRUB_MACHINE_IEEE1275) #elif defined (GRUB_MACHINE_IEEE1275)
#include <grub/ieee1275/ieee1275.h> #include <grub/ieee1275/ieee1275.h>
#define HAS_VGA_TEXT 0 #define HAS_VGA_TEXT 0
#define DEFAULT_VIDEO_MODE "text" #define DEFAULT_VIDEO_MODE "text"
#define ACCEPTS_PURE_TEXT 1
#else #else
#include <grub/i386/pc/vbe.h> #include <grub/i386/pc/vbe.h>
#include <grub/i386/pc/console.h> #include <grub/i386/pc/console.h>
#define HAS_VGA_TEXT 1 #define HAS_VGA_TEXT 1
#define DEFAULT_VIDEO_MODE "text" #define DEFAULT_VIDEO_MODE "text"
#define ACCEPTS_PURE_TEXT 1
#endif #endif
#define GRUB_LINUX_CL_OFFSET 0x1000 #define GRUB_LINUX_CL_OFFSET 0x1000
@ -483,12 +486,22 @@ grub_linux_boot (void)
tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar); tmp = grub_xasprintf ("%s;" DEFAULT_VIDEO_MODE, modevar);
if (! tmp) if (! tmp)
return grub_errno; return grub_errno;
#if ACCEPTS_PURE_TEXT
err = grub_video_set_mode (tmp, 0, 0); err = grub_video_set_mode (tmp, 0, 0);
#else
err = grub_video_set_mode (tmp, GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
#endif
grub_free (tmp); grub_free (tmp);
} }
else else
err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0, 0); {
#if ACCEPTS_PURE_TEXT
err = grub_video_set_mode (DEFAULT_VIDEO_MODE, 0, 0);
#else
err = grub_video_set_mode (DEFAULT_VIDEO_MODE,
GRUB_VIDEO_MODE_TYPE_PURE_TEXT, 0);
#endif
}
if (err) if (err)
{ {
grub_print_error (); grub_print_error ();