lp:ubuntu/natty/grub2

Created by James Westby on 2010-10-13 and last modified on 2011-04-21
Get this branch:
bzr branch lp:ubuntu/natty/grub2
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Owner:
Ubuntu branches
Status:
Mature

Recent revisions

121. By Colin Watson on 2011-04-21

* Cherry-pick from upstream:
  - Fix grub-install on amd64 EFI systems.

120. By Colin Watson on 2011-04-21

[ St├ęphane Graber ]
* Update default/grub.md5sum to include maverick's default md5sum to avoid
  prompt during update (LP: #759545).

[ Colin Watson ]
* Cherry-pick from upstream:
  - Support huge btrfs chunks.
  - Fix stack pointer handling in 16-bit relocator (LP: #683904).

119. By Colin Watson on 2011-04-15

* 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 and an aubergine background for Ubuntu.
  - Apply Ubuntu GRUB Legacy changes to legacy update-grub script.
  - Fix backslash-escaping in merge_debconf_into_conf.
  - Remove "GNU/Linux" from default distributor string.
  - Add crashkernel option.
  - Bypass menu unless other OSes are installed or Shift is pressed.
  - Allow Shift to interrupt 'sleep --interruptible'.
  - Reduce visual clutter in normal mode.
  - Remove verbose messages printed before reading configuration.
  - Suppress kernel/initrd progress messages, except in recovery mode.
  - Handle filesystems loop-mounted on file images.
  - Ignore devices loop-mounted from files in Linux grub.d scripts.
  - Show the boot menu if the previous boot failed.
  - Don't generate device.map during grub-install or grub-mkconfig.
  - Adjust upgrade version checks for Ubuntu.
  - Suppress "GRUB loading" message unless Shift is held down.
  - Adjust versions of grub-doc and grub-legacy-doc conflicts.
  - Fix LVM/RAID probing in the absence of /boot/grub/device.map.
  - Look for .mo files in /usr/share/locale-langpack first.
  - Build-depend on qemu-kvm rather than qemu-system for grub-pc tests.
  - Add a grub-rescue-efi-amd64 package.
  - On Wubi, just update wubildr rather than asking for an install device.
  - Check hardware support before using gfxpayload=keep.
  - Put second and subsequent Linux menu entries in a submenu.
  - Preferred resolution detection for VBE.
  - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
  - Add grub-mount-udeb, containing just grub-mount.
* Use /lib/plymouth/themes/default.grub if it exists, rather than
  hardcoding an aubergine background (LP: #696915).

118. By Colin Watson on 2011-04-11

* 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 and an aubergine background for Ubuntu.
  - Apply Ubuntu GRUB Legacy changes to legacy update-grub script.
  - Fix backslash-escaping in merge_debconf_into_conf.
  - Remove "GNU/Linux" from default distributor string.
  - Add crashkernel option.
  - Bypass menu unless other OSes are installed or Shift is pressed.
  - Allow Shift to interrupt 'sleep --interruptible'.
  - Reduce visual clutter in normal mode.
  - Remove verbose messages printed before reading configuration.
  - Suppress kernel/initrd progress messages, except in recovery mode.
  - Handle filesystems loop-mounted on file images.
  - Ignore devices loop-mounted from files in Linux grub.d scripts.
  - Show the boot menu if the previous boot failed.
  - Don't generate device.map during grub-install or grub-mkconfig.
  - Adjust upgrade version checks for Ubuntu.
  - Suppress "GRUB loading" message unless Shift is held down.
  - Adjust versions of grub-doc and grub-legacy-doc conflicts.
  - Fix LVM/RAID probing in the absence of /boot/grub/device.map.
  - Look for .mo files in /usr/share/locale-langpack first.
  - Build-depend on qemu-kvm rather than qemu-system for grub-pc tests.
  - Add a grub-rescue-efi-amd64 package.
  - On Wubi, just update wubildr rather than asking for an install device.
  - Check hardware support before using gfxpayload=keep.
  - Put second and subsequent Linux menu entries in a submenu.
  - Preferred resolution detection for VBE.
  - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
  - Add grub-mount-udeb, containing just grub-mount.
* Default to gfxpayload=keep if gfxblacklist.txt is missing (LP: #757603).
* Depend on grub-gfxpayload-lists on i386 and amd64.

117. By Colin Watson on 2011-04-10

* 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 and an aubergine background 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 option.
  - Bypass menu unless other OSes are installed or Shift is pressed.
  - Allow Shift to interrupt 'sleep --interruptible'.
  - Reduce visual clutter in normal mode.
  - Remove verbose messages printed before reading configuration.
  - Suppress kernel/initrd progress messages, except in recovery mode.
  - Handle filesystems loop-mounted on file images.
  - Ignore devices loop-mounted from files in Linux grub.d scripts.
  - Show the boot menu if the previous boot failed.
  - Don't generate device.map during grub-install or grub-mkconfig.
  - Adjust upgrade version checks for Ubuntu.
  - Suppress "GRUB loading" message unless Shift is held down.
  - Adjust versions of grub-doc and grub-legacy-doc conflicts.
  - Fix LVM/RAID probing in the absence of /boot/grub/device.map.
  - Look for .mo files in /usr/share/locale-langpack first.
  - Build-depend on qemu-kvm rather than qemu-system for grub-pc tests.
  - Add a grub-rescue-efi-amd64 package.
  - On Wubi, don't ask for an install device, but just update wubildr
    using the diverted grub-install.
  - Check hardware support before using gfxpayload=keep.
  - Build part_msdos and vfat into EFI boot images.
  - Put second and subsequent Linux menu entries in a submenu.
  - Preferred resolution detection for VBE.
  - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
  - Add grub-mount-udeb, containing just grub-mount.

116. By Colin Watson on 2011-04-10

* 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 and an aubergine background 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 option.
  - Bypass menu unless other OSes are installed or Shift is pressed.
  - Allow Shift to interrupt 'sleep --interruptible'.
  - Reduce visual clutter in normal mode.
  - Remove verbose messages printed before reading configuration.
  - Suppress kernel/initrd progress messages, except in recovery mode.
  - Handle filesystems loop-mounted on file images.
  - Ignore devices loop-mounted from files in Linux grub.d scripts.
  - Show the boot menu if the previous boot failed.
  - Don't generate device.map during grub-install or grub-mkconfig.
  - Adjust upgrade version checks for Ubuntu.
  - Suppress "GRUB loading" message unless Shift is held down.
  - Adjust versions of grub-doc and grub-legacy-doc conflicts.
  - Fix LVM/RAID probing in the absence of /boot/grub/device.map.
  - Look for .mo files in /usr/share/locale-langpack first.
  - Build-depend on qemu-kvm rather than qemu-system for grub-pc tests.
  - Add a grub-rescue-efi-amd64 package.
  - On Wubi, don't ask for an install device, but just update wubildr
    using the diverted grub-install.
  - Check hardware support before using gfxpayload=keep.
  - Build part_msdos and vfat into EFI boot images.
  - Put second and subsequent Linux menu entries in a submenu.
  - Preferred resolution detection for VBE.
  - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
  - Fix use of freed memory when replacing existing loopback device.
  - Add grub-mount-udeb, containing just grub-mount.

115. By Colin Watson on 2011-04-09

* 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 and an aubergine background 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 option.
  - Bypass menu unless other OSes are installed or Shift is pressed.
  - Allow Shift to interrupt 'sleep --interruptible'.
  - Reduce visual clutter in normal mode.
  - Remove verbose messages printed before reading configuration.
  - Suppress kernel/initrd progress messages, except in recovery mode.
  - Handle filesystems loop-mounted on file images.
  - Ignore devices loop-mounted from files in Linux grub.d scripts.
  - Show the boot menu if the previous boot failed.
  - Don't generate device.map during grub-install or grub-mkconfig.
  - Adjust upgrade version checks for Ubuntu.
  - Suppress "GRUB loading" message unless Shift is held down.
  - Adjust versions of grub-doc and grub-legacy-doc conflicts.
  - Fix LVM/RAID probing in the absence of /boot/grub/device.map.
  - Look for .mo files in /usr/share/locale-langpack first.
  - Build-depend on qemu-kvm rather than qemu-system for grub-pc tests.
  - Add a grub-rescue-efi-amd64 package.
  - On Wubi, don't ask for an install device, but just update wubildr
    using the diverted grub-install.
  - Check hardware support before using gfxpayload=keep.
  - Build part_msdos and vfat into EFI boot images.
  - Put second and subsequent Linux menu entries in a submenu.
  - Preferred resolution detection for VBE.
  - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
  - Fix use of freed memory when replacing existing loopback device.
* Add grub-mount-udeb, containing just grub-mount. This can be used by
  os-prober and other parts of d-i.

114. By Colin Watson on 2011-04-05

Make sure to reinstall GRUB on upgrade if Wubi is in use (LP: #742967).

113. By Colin Watson on 2011-04-01

* 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 and an aubergine background 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 option.
  - Bypass menu unless other OSes are installed or Shift is pressed.
  - Allow Shift to interrupt 'sleep --interruptible'.
  - Reduce visual clutter in normal mode.
  - Remove verbose messages printed before reading configuration.
  - Suppress kernel/initrd progress messages, except in recovery mode.
  - Handle filesystems loop-mounted on file images.
  - Ignore devices loop-mounted from files in Linux grub.d scripts.
  - Show the boot menu if the previous boot failed.
  - Don't generate device.map during grub-install or grub-mkconfig.
  - Adjust upgrade version checks for Ubuntu.
  - Suppress "GRUB loading" message unless Shift is held down.
  - Adjust versions of grub-doc and grub-legacy-doc conflicts.
  - Fix LVM/RAID probing in the absence of /boot/grub/device.map.
  - Look for .mo files in /usr/share/locale-langpack first.
  - Build-depend on qemu-kvm rather than qemu-system for grub-pc tests.
  - Add a grub-rescue-efi-amd64 package.
  - On Wubi, don't ask for an install device, but just update wubildr
    using the diverted grub-install.
  - Check hardware support before using gfxpayload=keep.
  - Build part_msdos and vfat into EFI boot images.
  - Put second and subsequent Linux menu entries in a submenu.
  - Preferred resolution detection for VBE.
  - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
* Drop patch to use qemu rather than qemu-system-i386, now that qemu-kvm
  ships a symlink.
* Rewrite hwmatch.lua in C. Drop lua grub-extras module.
* Update ubuntu_vbe_autodetect.patch, bringing GRUB_GFXMODE documentation
  up to date.
* Fix use of freed memory when replacing existing loopback device
  (LP: #742967).

112. By Colin Watson on 2011-03-25

* 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 and an aubergine background 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 option.
  - Bypass menu unless other OSes are installed or Shift is pressed.
  - Allow Shift to interrupt 'sleep --interruptible'.
  - Reduce visual clutter in normal mode.
  - Remove verbose messages printed before reading configuration.
  - Suppress kernel/initrd progress messages, except in recovery mode.
  - Handle filesystems loop-mounted on file images.
  - Ignore devices loop-mounted from files in Linux grub.d scripts.
  - Show the boot menu if the previous boot failed.
  - Don't generate device.map during grub-install or grub-mkconfig.
  - Adjust upgrade version checks for Ubuntu.
  - Suppress "GRUB loading" message unless Shift is held down.
  - Adjust versions of grub-doc and grub-legacy-doc conflicts.
  - Fix LVM/RAID probing in the absence of /boot/grub/device.map.
  - Look for .mo files in /usr/share/locale-langpack first.
  - Make sure GRUB_TIMEOUT isn't quoted unnecessarily.
  - Build-depend on qemu-kvm rather than qemu-system for grub-pc tests.
  - Use qemu rather than qemu-system-i386.
  - Add a grub-rescue-efi-amd64 package.
  - On Wubi, don't ask for an install device, but just update wubildr
    using the diverted grub-install.
  - Enable lua from grub-extras.
  - Incorporate the bitop library into lua.
  - Add enum_pci function to grub module in lua.
  - Check hardware support before using gfxpayload=keep.
  - Build part_msdos and vfat into EFI boot images.
  - Put second and subsequent Linux menu entries in a submenu.
  - Preferred resolution detection for VBE.
  - Set vt.handoff=7 for smooth handoff to kernel graphical mode.
  - Build with gcc-4.5 on ppc64.
  - Add apport hook for ProblemType = 'Package'.

Branch metadata

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

Subscribers