Created by Ubuntu Package Importer on 2013-10-21 and last modified on 2014-04-11
Get this branch:
bzr branch lp:ubuntu/trusty/grub2
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches

Recent revisions

190. By Colin Watson on 2014-04-10

* Backport from upstream:
  - Tolerate devices with no filesystem UUID returned by os-prober
    (LP: #1287436).

189. By Colin Watson on 2014-03-31

[ Colin Watson ]
* Backport from upstream:
  - ieee1275: check for IBM pseries emulated machine.
  - Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig
    (closes: #735935).
  - btrfs: fix get_root key comparison failures due to endianness.
* Build-depend on automake (>= 1.10.1) to ensure that it meets configure's
  requirements (LP: #1299041).
* When installing an image for use with UEFI Secure Boot, generate a
  load.cfg even if there are no device abstractions in use (LP: #1298399).

[ Jon Severinsson ]
* Add Tanglu support, as in Debian except:
  - Enable splash screen by default (as Ubuntu)
  - Enable quiet and quick boot (as Ubuntu)
  - Enable the grub-common init script (as Ubuntu)
  - Enable dynamic gfxpayload (as Ubuntu)
  - Enable vt handover (as Ubuntu)
  - Use monochromatic theme by default (as Ubuntu)
  - Use Tanglu GRUB wallpaper by default.

188. By Colin Watson on 2014-03-10

* Fix shift-held-down test not to clear other modifier key states
  (LP: #843804).
* Explicitly pass an appropriate --target to grub-install in the postinst
  (suggested by Jordan Uggla).
* Backport from upstream:
  - Use bootaa64.efi instead of bootaarch64.efi on arm64 to comply with
    EFI specification. Also use grubaa64.efi for consistency.

187. By Colin Watson on 2014-01-28

* Install bootinfo.txt and grub.chrp into grub-ieee1275-bin on powerpc and
* Port yaboot logic to improve installation for various powerpc machine
* Improve parsing of /etc/default/grub.d/*.cfg in C utilities
  (LP: #1273694).
* Run grub-install on install or upgrade on grub-ieee1275/ppc64el.

186. By Colin Watson on 2014-01-27

* Add a number of EFI debugging commands to the signed image (lsefi,
  lsefimmap, lsefisystab, lssal).
* Add gfxterm_background to the signed image so that background_image
  works in UEFI Secure Boot mode. Thanks to syscon-hh for the report.

185. By Colin Watson on 2014-01-20

* Remove redundant build-dependencies on autoconf and automake, covered by
* In --enable-quick-boot mode, restore previous behaviour of using a
  hidden timeout if GRUB_HIDDEN_TIMEOUT=0 (thanks to Sebastien Bacher for
  the report).
* Disable cpio test on kFreeBSD again for now; it fails within cpio itself
  with "field width not sufficient for storing rdev minor".
* Copy shim.efi.signed to the correct path in UEFI Secure Boot mode.
  Thanks to syscon-hh for the report.

184. By Colin Watson on 2014-01-16

* Convert patch handling to git-dpm.
* Add bi-endian support to ELF parser (Tomohiro B Berry).
* Adjust restore_mkdevicemap.patch to mark get_kfreebsd_version as static,
  to appease "gcc -Werror=missing-prototypes".
* Cherry-pick from upstream:
  - Change grub-macbless' manual page section to 8.
* Install grub-glue-efi, grub-macbless, grub-render-label, and
* grub-shell: Pass -no-pad to xorriso when building floppy images.

183. By Colin Watson on 2013-12-12

* Backport from upstream:
  - On Linux, read partition start offsets from sysfs if possible
    (LP: #1237519).
  - Fix sector number when writing to non-512B disks (LP: #1253443).
* Regularise indentation of "recordfail" in /etc/grub.d/10_linux.

182. By Colin Watson on 2013-12-03

[ Robert Millan ]
* Backport from upstream:
  - Accept ZFS version 5000 (feature based).

[ Colin Watson ]
* Silence error message on initial installation when /etc/default/grub
  does not yet exist.
* Add GRUB_RECOVERY_TITLE option, to allow the controversial "recovery
  mode" text to be customised (LP: #1240360).
* Backport from upstream:
  - Revamp hidden timeout handling by adding a new timeout_style
    environment variable and a corresponding GRUB_TIMEOUT_STYLE
    configuration key for grub-mkconfig. This controls hidden-timeout
    handling more simply than the previous arrangements, and pressing any
    hotkeys associated with menu entries during the hidden timeout will
    now boot the corresponding menu entry immediately (LP: #1178618). As
    part of merging this, radically simplify the mess that
    quick_boot.patch had made of /etc/grub.d/30_os-prober; if it finds
    other OSes it can now just set timeout_style=menu and make sure the
    timeout is non-zero.
  - Fix build with FreeType 2.5.1.

181. By Colin Watson on 2013-11-14

* Backport from upstream:
  - Sort gnumach kernels in version order (closes: #725451).
* Move packaging to git, following upstream. Adjust Vcs-* fields.
* Remove obsolete DM-Upload-Allowed field.
* Merge (completely!) from Ubuntu:
  - Handle probing striped DM-RAID devices (thanks, Robert Collins;
    LP: #803658).
  - Unconditionally create grub.cfg on our EFI boot partition in Secure
    Boot mode; GRUB always needs some configuration in this case to find
    /boot/grub, since we can't modify the signed image at install time
    (Steve Langasek, LP: #1236625).
  - If MokManager is present on the host system, copy it onto the EFI boot
    partition for use (Steve Langasek).
  - Adjust UEFI installation to cope with Kubuntu setting GRUB_DISTRIBUTOR
    (LP: #1242417).
  - If building for Ubuntu:
    + Bypass menu unless other OSes are installed or Shift is pressed.
    + Show the boot menu if the previous boot failed.
    + Set GRUB_GFXPAYLOAD_LINUX=keep unless it's known to be unsupported
      on the current hardware.
    + Set vt.handoff=7 for smooth handoff to kernel graphical mode.
    + In recovery mode, add nomodeset to the Linux kernel arguments, and
      remove the 'set gfxpayload=keep' command.
    + Set default timeout to 10 seconds.
    + Enable hidden timeout support by default.
  - Migrate timeout settings from menu.lst.
  - Probe FusionIO devices (LP: #1237519).
* Make grub.cfg world-unreadable if even hashed passwords are in use
  (closes: #632598).

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.