Amend gfxpayload_keep_default.patch to no longer remove the call to

load_video when GRUB_GFXPAYLOAD_LINUX is empty (closes: #661789).

debian/changelog

@@ -1,3 +1,10 @@
+grub2 (1.99-27) UNRELEASED; urgency=low
+
+  * Amend gfxpayload_keep_default.patch to no longer remove the call to
+    load_video when GRUB_GFXPAYLOAD_LINUX is empty (closes: #661789).
+
+ -- Colin Watson <cjwatson@debian.org>  Sun, 20 Jan 2013 16:35:19 +0000
+
 grub2 (1.99-26) unstable; urgency=low
 
   * Remove /boot/grub/unicode.pf2 on purge of grub-efi-{amd64,i386} (closes:

debian/patches/gfxpayload_keep_default.patch

@@ -17,22 +17,16 @@ Index: b/util/grub.d/10_linux.in
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -77,17 +77,7 @@
+@@ -81,12 +81,6 @@
- 
+       cat << EOF
-   # Use ELILO's generic "efifb" when it's known to be available.
+ 	load_video
-   # FIXME: We need an interface to select vesafb in case efifb can't be used.
+ EOF
--  if [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then
--      cat << EOF
--	load_video
--EOF
 -      if grep -qx "CONFIG_FB_EFI=y" "${config}" 2> /dev/null \
 -	  && grep -qx "CONFIG_VT_HW_CONSOLE_BINDING=y" "${config}" 2> /dev/null; then
 -	  cat << EOF
 -	set gfxpayload=keep
 -EOF
 -      fi
--  else
+   else
-+  if [ "x$GRUB_GFXPAYLOAD_LINUX" != x ]; then
        if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then
  	  cat << EOF
- 	load_video