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

Proposed by Evan Broder
Status: Merged
Merged at revision: 2077
Proposed branch: lp://qastaging/~broder/ubuntu/natty/grub2/no-if-in-menuentry
Merge into: lp://qastaging/~ubuntu-core-dev/ubuntu/natty/grub2/natty
Diff against target: 51 lines (+10/-3)
2 files modified
debian/changelog (+7/-0)
debian/patches/ubuntu_gfxpayload_filter.patch (+3/-3)
To merge this branch: bzr merge lp://qastaging/~broder/ubuntu/natty/grub2/no-if-in-menuentry
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+42200@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2010-11-29.

Description of the change

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.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote : Posted in a previous version of this proposal

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
Revision history for this message
Colin Watson (cjwatson) wrote :

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

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches