From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 1 Nov 2010 11:36:00 +0000 (+0100)
Subject: 	* util/grub.d/10_linux.in: Add missing load_video with explicit
X-Git-Tag: 1.99~359
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8729d984a20a0bbd3d29f3cebae9524fe58c746;p=thirdparty%2Fgrub.git

	* util/grub.d/10_linux.in: Add missing load_video with explicit
	GRUB_GFXPAYLOAD_LINUX.
---

diff --git a/ChangeLog b/ChangeLog
index d1ea981d8..96df25ede 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-01  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* util/grub.d/10_linux.in: Add missing load_video with explicit
+	GRUB_GFXPAYLOAD_LINUX.
+
 2010-11-01  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* Makefile.am (libgrub.pp): Propagate the libgrub.a split.
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
index ceee61154..5e522ba4a 100644
--- a/util/grub.d/10_linux.in
+++ b/util/grub.d/10_linux.in
@@ -78,6 +78,11 @@ EOF
 EOF
       fi
   else
+      if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
+	  cat << EOF
+	load_video
+EOF
+      fi
 	  cat << EOF
 	set gfxpayload=$GRUB_GFXPAYLOAD_LINUX
 EOF