Merge lp://staging/~vorlon/ubuntu/saucy/grub2/lp.1236625 into lp://staging/~ubuntu-core-dev/ubuntu/raring/grub2/raring
Proposed by
Steve Langasek
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://staging/~vorlon/ubuntu/saucy/grub2/lp.1236625 |
| Merge into: | lp://staging/~ubuntu-core-dev/ubuntu/raring/grub2/raring |
| Diff against target: |
3698 lines (+1964/-711) 68 files modified
Makefile.util.def (+6/-0) config.h.in (+2/-0) configure.ac (+16/-0) debian/bug-script (+1/-1) debian/build-efi-images (+24/-6) debian/changelog (+249/-0) debian/config.in (+3/-2) debian/control (+3/-3) debian/dirs.in (+0/-1) debian/grub-common.install.in (+0/-1) debian/grub-common.maintscript.hurd.in (+3/-0) debian/grub-common.maintscript.kfreebsd.in (+3/-0) debian/grub-common.maintscript.linux.in (+3/-0) debian/grub.d/05_debian_theme (+24/-16) debian/grub2.dirs (+0/-1) debian/grub2.install (+0/-2) debian/install-bin.in (+0/-3) debian/install.in (+0/-2) debian/patches/acpihalt_improvements.patch (+191/-0) debian/patches/efi_always_install_grub_cfg.patch (+36/-0) debian/patches/efidisk_non_512_sectors.patch (+56/-0) debian/patches/install_bios_setup_path.patch (+20/-0) debian/patches/install_signed.patch (+9/-13) debian/patches/maybe_quiet.patch (+362/-0) debian/patches/mkconfig_emacs_autosave.patch (+20/-0) debian/patches/mkconfig_signed_kernel.patch (+2/-2) debian/patches/mkconfig_ubuntu_distributor.patch (+11/-7) debian/patches/os_prober_efi.patch (+36/-0) debian/patches/probe_error_handling.patch (+22/-0) debian/patches/restore_mkdevicemap.patch (+1/-1) debian/patches/script_check_no_commands.patch (+87/-0) debian/patches/series (+12/-7) debian/patches/sleep_shift.patch (+53/-0) debian/patches/texinfo_ordering.patch (+21/-0) debian/patches/ubuntu_acpihalt_improvements.patch (+0/-191) debian/patches/ubuntu_crashkernel.patch (+3/-3) debian/patches/ubuntu_failed_boot_menu.patch (+27/-5) debian/patches/ubuntu_gfxpayload_filter.patch (+2/-2) debian/patches/ubuntu_linux_quiet.patch (+0/-41) debian/patches/ubuntu_normal_quiet.patch (+0/-62) debian/patches/ubuntu_quick_boot.patch (+17/-8) debian/patches/ubuntu_quiet_grub_loading.patch (+0/-106) debian/patches/ubuntu_really_quiet.patch (+0/-77) debian/patches/ubuntu_recovery_nomodeset.patch (+2/-2) debian/patches/ubuntu_sleep_shift.patch (+0/-53) debian/patches/ubuntu_vt_handoff.patch (+3/-3) debian/patches/ubuntu_wubi_no_windows.patch (+0/-47) debian/patches/wubi_no_windows.patch (+47/-0) debian/po/hu.po (+411/-0) debian/postinst.in (+2/-3) debian/rules (+19/-10) docs/grub-dev.texi (+1/-1) grub-core/boot/i386/pc/boot.S (+5/-1) grub-core/boot/i386/pc/diskboot.S (+10/-1) grub-core/disk/efi/efidisk.c (+14/-7) grub-core/kern/main.c (+11/-0) grub-core/kern/rescue_reader.c (+4/-0) grub-core/normal/main.c (+6/-0) grub-core/normal/menu.c (+14/-1) tests/grub_script_no_commands.in (+21/-0) util/deviceiter.c (+1/-1) util/getroot.c (+1/-0) util/grub-install.in (+13/-9) util/grub-mkconfig.in (+1/-1) util/grub-script-check.c (+9/-1) util/grub.d/00_header.in (+14/-0) util/grub.d/10_linux.in (+11/-7) util/grub.d/30_os-prober.in (+19/-0) |
| To merge this branch: | bzr merge lp://staging/~vorlon/ubuntu/saucy/grub2/lp.1236625 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Colin Watson | Pending | ||
|
Review via email:
|
|||
This proposal has been superseded by 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 :)
To post a comment you must log in.
Unmerged revisions
- 2358. By Steve Langasek
-
Remove accidentally-
included cruft from the patch - 2357. By Steve Langasek
-
rearrange the patch at Colin's request
- 2356. By Steve Langasek
-
Rename patch, per Colin
- 2355. By Steve Langasek
-
debian/
patches/ efi_always_ install_ grub_cfg. patch: unconditionally
create grub.cfg on our EFI boot partition. Closes LP: #1236625. - 2354. By Colin Watson
-
releasing package grub2 version 2.00-19ubuntu1
- 2353. By Colin Watson
-
merge from Debian 2.00-19
- 2352. By Colin Watson
-
* Backport from upstream:
- Handle partitions on non-512B EFI disks (LP: #1065281). - 2351. By Colin Watson
-
releasing package grub2 version 2.00-18ubuntu4
- 2350. By Colin Watson
-
Restore "-p /EFI/ubuntu" to the grub-mkimage call that creates
grubx64.efi, to fix the case of booting from a hard disk with Secure
Boot enabled. - 2349. By Colin Watson
-
releasing package grub2 version 2.00-18ubuntu3
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
