Created by James Westby on 2011-01-25 and last modified on 2011-04-27
Get this branch:
bzr branch lp:ubuntu/maverick-proposed/grub2
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

89. By Colin Watson on 2011-04-27

* Fix use of freed memory when replacing existing loopback device
  (LP: #742967).
* Make sure to reinstall GRUB on upgrade if Wubi is in use (LP: #742967).
* Enable grub-fstest, so that we can use it to help find wubildr
  (LP: #610898).
* Make NTFS UUIDs uppercase (LP: #695290).

88. By Colin Watson on 2011-04-05

Backport multipath probing fixes (LP: #687501).

87. By Colin Watson on 2011-01-20

* If we're upgrading and /boot/grub/core.img doesn't exist, then don't ask
  where to install GRUB, since it probably means we're in some kind of
  specialised environment such as a live USB stick (LP: #591202).
* Drop the default priority of grub2/linux_cmdline to medium. We only
  need to ask it if we're upgrading from GRUB Legacy and found an empty
  kopt in menu.lst (LP: #591202).

86. By Colin Watson on 2010-10-06

* Improve message if too many embedding area sectors need to be avoided
  (thanks, Vladimir Serbinenko).
* Expand on "sector already in use" message to note that the software in
  question may cause other problems and suggest reporting a bug (thanks,
  Vladimir Serbinenko).
* Disable video_bochs and video_cirrus on PC BIOS systems, as probing PCI
  space seems to break on some systems (LP: #641259).

85. By Colin Watson on 2010-09-27

When embedding the core image in a post-MBR gap, check for and avoid
sectors matching any of a list of known signatures (mitigates LP
#441941; more work may be required).

84. By Colin Watson on 2010-09-20

* Resynchronise with Debian. Remaining changes:
  - Adjust for default Ubuntu boot options ("quiet splash").
  - Default to hiding the menu; holding down Shift at boot will show it.
  - Set a monochromatic theme for Ubuntu.
  - Apply Ubuntu GRUB Legacy changes to legacy update-grub script: title,
    recovery mode, quiet option, tweak how memtest86+ is displayed, and
    use UUIDs where appropriate.
  - Fix backslash-escaping in merge_debconf_into_conf.
  - Remove "GNU/Linux" from default distributor string.
  - Add crashkernel= options if kdump and makedumpfile are available.
  - If other operating systems are installed, then automatically unhide
    the menu. Otherwise, if GRUB_HIDDEN_TIMEOUT is 0, then use keystatus
    if available to check whether Shift is pressed. If it is, show the
    menu, otherwise boot immediately. If keystatus is not available, then
    fall back to a short delay interruptible with Escape.
  - Allow Shift to interrupt 'sleep --interruptible'.
  - Don't display introductory message about line editing unless we're
    actually offering a shell prompt. Don't clear the screen just before
    booting if we never drew the menu in the first place.
  - Remove some verbose messages printed before reading the configuration
  - Suppress progress messages as the kernel and initrd load for
    non-recovery kernel menu entries.
  - Change prepare_grub_to_access_device to handle filesystems
    loop-mounted on file images.
  - Ignore devices loop-mounted from files in 10_linux.
  - Show the boot menu if the previous boot failed, that is if it failed
    to get to the end of one of the normal runlevels.
  - Handle RAID devices containing virtio components.
  - Don't generate /boot/grub/device.map during grub-install or
    grub-mkconfig by default.
  - Adjust upgrade version checks for Ubuntu.
  - Don't display "GRUB loading" unless Shift is held down.
  - Adjust versions of grub-doc and grub-legacy-doc conflicts to tolerate
    our backport of the grub-doc split.
  - Fix LVM/RAID probing in the absence of /boot/grub/device.map.
  - Look for .mo files in /usr/share/locale-langpack as well, in
  - Make sure GRUB_TIMEOUT isn't quoted unnecessarily.
  - Probe all devices in 'grub-probe --target=drive' if
    /boot/grub/device.map is missing.
  - Adjust hostdisk id for hard disks, allowing grub-setup to use its
    standard workaround for broken BIOSes.
  - Build-depend on qemu-kvm rather than qemu-system for grub-pc tests.
  - Use qemu rather than qemu-system-i386.
  - Extend the EFI version of grub-install to be able to install into an
    EFI System Partition mounted on /boot/efi in a location that complies
    with the EFI specification.
  - Upgrade the installed core image when upgrading grub-efi-ia32 or
    grub-efi-amd64, although only if /boot/efi/EFI/ubuntu already exists.
  - Make grub-efi-ia32 and grub-efi-amd64 depend on efibootmgr so that
    grub-install works properly.
  - Program vesafb on BIOS systems rather than efifb.
  - Add a grub-rescue-efi-amd64 package containing a rescue CD-ROM image
    for EFI-AMD64.
  - Extend EFI initialisation code to understand (,$partition)-style
    prefixes. If the EFI System Partition is on the same disk as
    /boot/grub, use this rather than allowing GRUB to set the prefix to
    the EFI System Partition by default.
  - Handle partition devices without corresponding disk devices.
* Extend ubuntu_linux_no_loopmount.patch to ignore devices loop-mounted
  from files in /etc/grub.d/20_linux_xen as well as /etc/grub.d/10_linux,
  quelling a warning message on Wubi.
* On Wubi, don't ask for an install device, but just update wubildr using
  the diverted grub-install (LP: #581760).

83. By Colin Watson on 2010-09-10

Handle partition devices without corresponding disk devices
(LP: #623609).

82. By Colin Watson on 2010-09-08

[ Colin Watson ]
* Make grub-efi-amd64 conflict with grub-pc as well as the other way round
  (LP: #632642).
* Extend EFI initialisation code to understand (,$partition)-style
  prefixes. If the EFI System Partition is on the same disk as
  /boot/grub, use this rather than allowing GRUB to set the prefix to the
  EFI System Partition by default (LP: #632775). (If they're on different
  disks, grub-install already used a UUID to find /boot/grub.)

[ Mario Limonciello ]
* Modify ubuntu_efi_install to check for case-insensitive EFI distributor.
  (LP: #632706)

81. By Colin Watson on 2010-08-25

Adjust the EFI-AMD64 rescue CD image to find itself at boot time by
looking for /.disk/info, rather than by UUID. This is a temporary
measure to allow parts of this image to be incorporated into other CD

80. By Colin Watson on 2010-08-25

* Build-depend on mtools for grub-rescue-efi-amd64 build.
* Only build grub-rescue-efi-amd64 on architectures where we build

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.