From a0004df02064ac0e8d4eb4f6bb744f7a144c810e Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Sun, 20 Jan 2013 16:37:10 +0000 Subject: [PATCH] Amend gfxpayload_keep_default.patch to no longer remove the call to load_video when GRUB_GFXPAYLOAD_LINUX is empty (closes: #661789). --- debian/changelog | 7 +++++++ debian/patches/gfxpayload_keep_default.patch | 16 +++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/debian/changelog b/debian/changelog index adce6891d..0281a21cf 100644 --- a/debian/changelog +++ b/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 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: diff --git a/debian/patches/gfxpayload_keep_default.patch b/debian/patches/gfxpayload_keep_default.patch index 43cfb6fed..245c278f0 100644 --- a/debian/patches/gfxpayload_keep_default.patch +++ b/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 @@ - - # 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 [ "x$GRUB_GFXPAYLOAD_LINUX" = x ]; then -- cat << EOF -- load_video --EOF +@@ -81,12 +81,6 @@ + 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 -+ if [ "x$GRUB_GFXPAYLOAD_LINUX" != x ]; then + else if [ "x$GRUB_GFXPAYLOAD_LINUX" != xtext ]; then cat << EOF - load_video