← Back to branch summary

~cyphermox/ubuntu/wily/grub2/lp1097570

Viewing all changes in revision 101.

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2013-05-09 00:14:55 UTC
  • mfrom: (17.3.37 experimental)
  • Revision ID: package-import@ubuntu.com-20130509001455-cqwulmxvvmqae15a
Tags: 2.00-14
http://bugs.debian.org/703539
http://bugs.debian.org/698914
* Merge from Ubuntu:
  - Don't call update-grub in the zz-update-grub kernel hook if
    /boot/grub/grub.cfg doesn't exist.
  - acpihalt: expand parser to handle SSDTs and some more opcodes.  Fixes
    test suite hang with current seabios.
* Remove kernel-specific grub.d conffiles that were dropped from packages
  built for all but their corresponding kernel type in 1.96+20090307-1
  (closes: #703539).
* Look for grub-bios-setup in /usr/lib/grub/i386-pc/ as well (closes:
  #705636).
* Merge 1.99-27.1 (thanks, Steve McIntyre):
  - Add entries for Windows Boot Manager found via UEFI in os-prober
    (closes: #698914).

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: