=== modified file 'debian/changelog'
--- debian/changelog	2012-01-05 18:44:25 +0000
+++ debian/changelog	2012-04-05 09:04:58 +0000
@@ -1,3 +1,10 @@
+grub2 (1.99-14ubuntu4) UNRELEASED; urgency=low
+
+  * only supply vt.handoff=7 when we are using gfxpayload=keep, do this
+    even when the command line is modified before execution.  (LP: #942846)
+
+ -- Andy Whitcroft <apw@canonical.com>  Thu, 05 Apr 2012 10:04:01 +0100
+
 grub2 (1.99-14ubuntu3) precise; urgency=low
 
   * grep refuses to process files which are also its stdout channel

=== modified file 'debian/patches/ubuntu_recovery_nomodeset.patch'
--- debian/patches/ubuntu_recovery_nomodeset.patch	2011-10-01 09:30:24 +0000
+++ debian/patches/ubuntu_recovery_nomodeset.patch	2012-04-05 09:03:54 +0000
@@ -8,8 +8,8 @@
 
 Index: b/util/grub.d/10_linux.in
 ===================================================================
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
+--- a/util/grub.d/10_linux.in	2012-04-05 09:54:34.000000000 +0100
++++ b/util/grub.d/10_linux.in	2012-04-05 09:57:39.209070575 +0100
 @@ -93,11 +93,11 @@
  EOF
    if ! ${recovery} ; then
@@ -18,13 +18,13 @@
  
 -  cat << EOF
 +      cat << EOF
- 	set gfxpayload=\$linux_gfx_mode
+ 	gfxmode \$linux_gfx_mode
  EOF
 +  fi
  
    cat << EOF
  	insmod gzio
-@@ -233,7 +233,7 @@
+@@ -244,7 +244,7 @@
        quiet
    if [ "x${GRUB_DISABLE_RECOVERY}" != "xtrue" ]; then
      linux_entry "${OS}" "${version}" true \

=== modified file 'debian/patches/ubuntu_vt_handoff.patch'
--- debian/patches/ubuntu_vt_handoff.patch	2011-06-16 23:50:43 +0000
+++ debian/patches/ubuntu_vt_handoff.patch	2012-04-05 09:03:54 +0000
@@ -3,24 +3,51 @@
  directly because this saves users from having to resolve configuration file
  conflicts, especially since this may not be the final version of the
  parameter.
-Author: Colin Watson <cjwatson@ubuntu.com>
+Author: Colin Watson <cjwatson@ubuntu.com>, Andy Whitcroft <apw@canonical.com>
 Forwarded: not-needed
-Last-Update: 2010-12-15
+Last-Update: 2012-04-05
 
 Index: b/util/grub.d/10_linux.in
 ===================================================================
---- a/util/grub.d/10_linux.in
-+++ b/util/grub.d/10_linux.in
+--- a/util/grub.d/10_linux.in	2012-04-05 09:45:44.626245265 +0100
++++ b/util/grub.d/10_linux.in	2012-04-05 09:54:34.784874174 +0100
 @@ -65,6 +65,12 @@
    fi
  fi
  
 +for word in $GRUB_CMDLINE_LINUX_DEFAULT; do
 +  if [ "$word" = splash ]; then
-+    GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT vt.handoff=7"
++    GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT \$vt_handoff"
 +  fi
 +done
 +
  # add crashkernel option if we have the required tools
  if [ -x "/usr/bin/makedumpfile" ] && [ -x "/sbin/kexec" ]; then
      GRUB_CMDLINE_EXTRA="$GRUB_CMDLINE_EXTRA crashkernel=384M-2G:64M,2G-:128M"
+@@ -90,7 +96,7 @@
+   fi
+ 
+   cat << EOF
+-	set gfxpayload=\$linux_gfx_mode
++	gfxmode \$linux_gfx_mode
+ EOF
+ 
+   cat << EOF
+@@ -147,6 +153,17 @@
+ prepare_boot_cache=
+ prepare_root_cache=
+ 
++cat << 'EOF'
++function gfxmode {
++	set gfxpayload="$1"
++	if [ "$1" = "keep" ]; then
++		set vt_handoff=vt.handoff=7
++	else
++		set vt_handoff=
++	fi
++}
++EOF
++
+ # 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