Merge lp://staging/~vorlon/ubuntu/saucy/grub2/lp.1236625 into lp://staging/~ubuntu-core-dev/ubuntu/saucy/grub2/saucy

Proposed by Steve Langasek
Status: Merged
Approved by: Colin Watson
Approved revision: 2358
Merged at revision: 2355
Proposed branch: lp://staging/~vorlon/ubuntu/saucy/grub2/lp.1236625
Merge into: lp://staging/~ubuntu-core-dev/ubuntu/saucy/grub2/saucy
Diff against target: 132 lines (+77/-10)
4 files modified
debian/changelog (+7/-0)
debian/patches/series (+1/-0)
debian/patches/ubuntu_efi_always_install_grub_cfg.patch (+58/-0)
util/grub-install.in (+11/-10)
To merge this branch: bzr merge lp://staging/~vorlon/ubuntu/saucy/grub2/lp.1236625
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+189746@code.staging.launchpad.net

This proposal supersedes a proposal from 2013-10-08.

Description of the change

This seems like the straightforward fix for bug #1236625, please let me know
if I've screwed it up somewhere :)

(Resubmit - grr, where does bzr lp-propose-merge get these ideas?)

To post a comment you must log in.
2356. By Steve Langasek

Rename patch, per Colin

2357. By Steve Langasek

rearrange the patch at Colin's request

2358. By Steve Langasek

Remove accidentally-included cruft from the patch

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