2010-02-10 Vladimir Serbinenko <phcoder@gmail.com>

	Support GRUB_GFXPAYLOAD_LINUX.

	* util/grub-mkconfig.in: Export GRUB_GFXPAYLOAD_LINUX.
	* util/grub.d/10_linux.in (linux_entry): Handle GRUB_GFXPAYLOAD_LINUX.

diff --git a/ChangeLog b/ChangeLog
index b3e77335b0f78a015ebd5dff762a231f02d2ad04..b4eb12a5409e3cc6aadedd5867f7bfd5bf823999 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Support GRUB_GFXPAYLOAD_LINUX.
+
+       * util/grub-mkconfig.in: Export GRUB_GFXPAYLOAD_LINUX.
+       * util/grub.d/10_linux.in (linux_entry): Handle GRUB_GFXPAYLOAD_LINUX.
+
 2010-02-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * script/execute.c (grub_script_execute_cmdline): Use grub_print_error

diff --git a/util/grub-mkconfig.in b/util/grub-mkconfig.in
index 7e667fb3e6588da50e316713fc1ebf3899367edd..1363f479a84bad89c1fbf56681c87ac847a0c4d1 100644 (file)
--- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in
@@ -221,6 +221,7 @@ export GRUB_DEFAULT \
   GRUB_DISABLE_LINUX_RECOVERY \
   GRUB_GFXMODE \
   GRUB_THEME \
+  GRUB_GFXPAYLOAD_LINUX \
   GRUB_DISABLE_OS_PROBER
 
 if test "x${grub_cfg}" != "x"; then

diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index 8d5379fd66e42e9645debf6b6627cf8422be11f2..046874ef07d3e1e425d11ec75d0ce35140a0e7f6 100644 (file)
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -65,9 +65,15 @@ linux_entry ()
 
   # Use ELILO's generic "efifb" when it's known to be available.
   # FIXME: We need an interface to select vesafb in case efifb can't be used.
-  if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null ; then
-    cat << EOF
+  if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
+      if grep -qx "CONFIG_FB_EFI=y" /boot/config-${version} 2> /dev/null ; then
+         cat << EOF
        set gfxpayload=keep
+EOF
+      fi
+  else
+         cat << EOF
+       set gfxpayload=$GRUB_GFXPAYLOAD_LINUX
 EOF
   fi