Last commit made on 2018-02-02
Get this branch:
git clone -b tftp-bufio-fix 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

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

6d08f2c... by Łukasz Zemczak

releasing package grub2 version 2.02-2ubuntu4

8798dcb... by Łukasz Zemczak

Modify the existing vt_handoff.patch to set vt.handoff=1 instead of vt.handoff=7. This fixes some problems with netboot installed server systems + adds consistency as we're no longer running display servers on vt7.

[ dannf: re-applied for git-dpm by:
 git-dpm checkout-patched
 squashing the changes into the original vt handoff commit
 git-dpm update-patches ]

a33332a... by David Box

tsc: Change default tsc calibration method to pmtimer on EFI systems

On efi systems, make pmtimer based tsc calibration the default over the
pit. This prevents Grub from hanging on Intel SoC systems that power gate
the pit.

Signed-off-by: David E. Box <email address hidden>
Reviewed-by: Daniel Kiper <email address hidden>

Origin: upstream, https://git.savannah.gnu.org/cgit/grub.git/commit/?id=446794de8da4329ea532cbee4ca877bcafd0e534
Bug-Debian: https://bugs.debian.org/883193
Last-Update: 2017-12-01

Patch-Name: tsc_efi_default_to_pmtimer.patch

fad34e0... by Mathieu Trudel-Lapierre

Don't fail build on some warnings we know might show up building linuxefi


There are a few cases where we legitimately cast to memory that is bigger
than we need when building on one arch, because on a different arch it will
be just right. For example, grub_status_t can be int32 or int64, depending
on the size of void*.

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

Forwarded: no
Last-Updated: 2017-11-01
Patch-Name: dont-fail-efi-warnings.patch

4551301... by Chris Glass

Added knobs to allow non-initrd boot config

Added GRUB_FORCE_PARTUUID and GRUB_DISABLE_INITRD configuration knobs to allow
users to generate grub menu entries that boot directly to the kernel, without
using an initramfs.

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

Patch-Name: support_initrd-less_boot.patch