]> git.proxmox.com Git - grub2.git/blob - debian/patches/gfxpayload-keep-default.patch
New upstream release (2.04)
[grub2.git] / debian / patches / gfxpayload-keep-default.patch
1 From d768f3c486db716fe662b32afc1327f27fad012b Mon Sep 17 00:00:00 2001
2 From: Colin Watson <cjwatson@debian.org>
3 Date: Mon, 13 Jan 2014 12:12:57 +0000
4 Subject: Disable gfxpayload=keep by default
5
6 Setting gfxpayload=keep has been known to cause efifb to be
7 inappropriately enabled. In any case, with the current Linux kernel the
8 result of this option is that early kernelspace will be unable to print
9 anything to the console, so (for example) if boot fails and you end up
10 dumped to an initramfs prompt, you won't be able to see anything on the
11 screen. As such it shouldn't be enabled by default in Debian, no matter
12 what kernel options are enabled.
13
14 gfxpayload=keep is a good idea but rather ahead of its time ...
15
16 Bug-Debian: http://bugs.debian.org/567245
17 Forwarded: no
18 Last-Update: 2013-12-25
19
20 Patch-Name: gfxpayload-keep-default.patch
21 ---
22 util/grub.d/10_linux.in | 4 ----
23 1 file changed, 4 deletions(-)
24
25 diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
26 index 4532266be..dd5a60c71 100644
27 --- a/util/grub.d/10_linux.in
28 +++ b/util/grub.d/10_linux.in
29 @@ -114,10 +114,6 @@ linux_entry ()
30 # FIXME: We need an interface to select vesafb in case efifb can't be used.
31 if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
32 echo " load_video" | sed "s/^/$submenu_indentation/"
33 - if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
34 - && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
35 - echo " set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
36 - fi
37 else
38 if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
39 echo " load_video" | sed "s/^/$submenu_indentation/"