[PATCH] 10_linux: Default gfxpayload=keep only when booting using efi

[Mike Gilbert]

vesafb seems to be unreliable when using BIOS compat mode.
---
On Gentoo Linux, we are getting frequent reports of a "black screen" after
the Linux kernel has been loaded. Hopefully this will resolve it.

 ChangeLog               | 5 +++++
 util/grub.d/10_linux.in | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 190d19d..dff8342 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-17  Mike Gilbert  <address@hidden>
+
+       * util/grub.d/10_linux.in: Default gfxpayload=keep only when booting
+       using efi. vesafb seems to be unreliable when using BIOS compat mode.
+
 2014-10-14  Andrei Borzenkov  <address@hidden>
 
        * grub-core/loader/arm/linux.c: Use full initializer for initrd_ctx to
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index d2e2a8f..a54b888 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -104,7 +104,9 @@ linux_entry ()
       echo "   load_video" | sed "s/^/$submenu_indentation/"
       if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
          && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> 
/dev/null; then
-         echo "        set gfxpayload=keep" | sed "s/^/$submenu_indentation/"
+         echo '        if [ "x$grub_platform" = xefi ]; then' | sed 
"s/^/$submenu_indentation/"
+         echo "                set gfxpayload=keep" | sed 
"s/^/$submenu_indentation/"
+         echo '        fi' | sed "s/^/$submenu_indentation/"
       fi
   else
       if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
-- 
2.1.2