Merge lp:~broder/ubuntu/natty/grub2/no-if-in-menuentry into lp:~ubuntu-core-dev/ubuntu/natty/grub2/natty

[Evan Broder]

Older versions of GRUB [1] don't allow for if statements within menuentry blocks. They throw an error when they encounter one. If you don't have the grub-pc/install_devices debconf field set (such that GRUB isn't re-installed when it's upgraded), this can lead to an unbootable system when combined with the recent gfxpayload changes.

While you certainly *shouldn't* have grub-pc/install_devices set in the first place, it's easy to make our configuration resilient to this possibility.

[1] Definitely 1.98-1ubuntu1, which I realize is crazy ancient. Don't know when the feature was added.

[Colin Watson (cjwatson)]

What about the case where they've explicitly set GRUB_GFXPAYLOAD_LINUX=keep? That needs to call load_video too, I think.

review: Needs Fixing

[Colin Watson (cjwatson)]

Better now, thanks. I noticed the sense of the check was backwards (= "text" rather than != "text") and corrected that. Merged!

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-11-26 14:38:40 +0000
+++ debian/changelog	2010-11-30 02:52:17 +0000
@@ -1,3 +1,10 @@
+grub2 (1.99~20101126-1ubuntu2) natty; urgency=low
+
+  * Simplify the auto-generated menu entries for Linux to avoid using
+    syntax not supported by older GRUB releases.
+
+ -- Evan Broder <[e-mail]>  Sun, 28 Nov 2010 16:29:35 -0800
+
 grub2 (1.99~20101126-1ubuntu1) natty; urgency=low
 
   * Resynchronise with Debian experimental.  Remaining changes:

=== modified file 'debian/patches/ubuntu_gfxpayload_filter.patch'
--- debian/patches/ubuntu_gfxpayload_filter.patch	2010-11-24 13:57:30 +0000
+++ debian/patches/ubuntu_gfxpayload_filter.patch	2010-11-30 02:52:17 +0000
@@ -7,7 +7,7 @@
 ===================================================================
 --- a/util/grub.d/10_linux.in
 +++ b/util/grub.d/10_linux.in
-@@ -80,18 +80,10 @@
+@@ -80,18 +80,9 @@
        save_default_entry | sed -e "s/^/\t/"
    fi
  
@@ -22,14 +22,13 @@
 -	  cat << EOF
 -	set gfxpayload=$GRUB_GFXPAYLOAD_LINUX
 +  cat << EOF
-+	if [ "\$linux_gfx_mode" != text ]; then load_video; fi
 +	set gfxpayload=\$linux_gfx_mode
  EOF
 -  fi
  
    if [ -z "${prepare_boot_cache}" ]; then
      prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
-@@ -125,6 +117,30 @@
+@@ -125,6 +116,31 @@
        done`
  prepare_boot_cache=
  
@@ -56,6 +55,7 @@
 +fi
 +EOF
 +fi
++echo 'if [ "$linux_gfx_mode" = "text" ]; then load_video; fi'
 +
  while [ "x$list" != "x" ] ; do
    linux=`version_find_latest $list`