Last commit made on 2018-02-09
Get this branch:
git clone -b cyphermox/gfxpayload-text https://git.launchpad.net/~ubuntu-core-dev/grub/+git/ubuntu
Members of Ubuntu Core Development Team can upload to this branch. Log in for directions.

Branch merges

Branch information


Recent commits

48fcde9... by Mathieu Trudel-Lapierre

* debian/patches/skip_text_gfxpayload_where_not_supported.patch: Skip the
  'text' payload if it's not supported but present in gfxpayload, such as
  on EFI systems. (LP: #1711452)

38d9e2f... by Mathieu Trudel-Lapierre

video: skip 'text' gfxpayload if not supported, to fallback to default

On UEFI, 'text' gfxpayload is not supported, but we still reach parse_modespec
with it, which will obviously fail. Fortunately, whatever gfxpayload is set,
we still still have the 'auto' default to fall back to. Allow getting to this
fallback by not trying to parse 'text' as a modespec.

This is because 'text' correctly doesn't parse as a modespec, and ought to have
been ignored before we got to that point, just like it is immediately picked if
we're running on a system where 'text' is a supported video mode.

Signed-off-by: Mathieu Trudel-Lapierre <email address hidden>

Patch-Name: skip_text_gfxpayload_where_not_supported.patch

9137441... by Julian Andres Klode

change version to 2.02-2ubuntu7 (UNRELEASED)
debian/patches/shorter_version_info.patch: Only show the upstream version
in menu and console, and hide the package one in a package_version
variable. (LP: #1723434)

2682d07... by Julian Andres Klode

Show only upstream version, hide rest in package_version variable

The complete package version can get a bit long, so only show the
upstream version in the menu and on the top of the console, and
hide the complete version in a package_version variable.

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1723434
Last-Updated: 2018-02-08

Patch-Name: shorter_version_info.patch

26e6121... by Mathieu Trudel-Lapierre

releasing package grub2 version 2.02-2ubuntu6

01c7b7b... by Mathieu Trudel-Lapierre

debian/patches/bufio_sensible_block_sizes.patch: Don't use arbitrary file
fizes as block sizes in bufio: this avoids potentially seeking back in
the files unnecessarily, which may require re-open files that cannot be
seeked into, such as via TFTP. (LP: #1743249)

18e6620... by Steve Langasek

Don't use arbitrary file sizes as block sizes in bufio

When grub_bufio_open() is called with a buffer size greater than the size
of the file being buffered, it clamps the buffer size to the file size.
This seems sensible on the surface to avoid over-allocating memory, but
grub_bufio_read() also assumes that ~(block_size-1) gives a sensible
mask value... which is only true for power of 2 block sizes, not for
random file sizes.
If the file we're buffering is on tftp, we get particularly pathological
results because we wind up seeking backwards which requires re-requesting
the file from the tftp server - even though the whole file fit in a single
udp packet much smaller than the default buffer size.

Signed-off-by: Mathieu Trudel-Lapierre <email address hidden>

Author: Steve Langasek <email address hidden>
Forwarded: no
Last-Update: 2016-11-01
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1743249
Patch-Name: bufio_sensible_block_sizes.patch

3e16913... by dann frazier

releasing package grub2 version 2.02-2ubuntu5

1317102... by dann frazier

debian/patches/mkconfig_keep_native_term_active.patch: cherry-pick 52ef7b23

On UEFI systems, the installed GRUB may not output to the same device the
d-i GRUB used. Fix that. (LP: #1743884)

6be5686... by dann frazier

Keep the native terminal active when enabling gfxterm

grub-mkconfig will set GRUB_TERMINAL_OUTPUT to "gfxterm" unless the user
has overridden it. On EFI systems, this will stop output from going to the
default "console" terminal. When the EFI fw console is configured to output to
both serial and video, this will cause GRUB to only display on video - while
continuing to accept input from both video and serial.

Instead of switching from "console" to "gfxterm", let's output to both.

Reviewed-by: Daniel Kiper <email address hidden>

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1743884
Last-Updated: 2018-01-31

Patch-Name: mkconfig_keep_native_term_active.patch