Commit Graph

8731 Commits

Author SHA1 Message Date
Valentin Dornauer
047728f575 ACPIhalt: Add more ACPI opcodes.
The AML parser implements only a small subset of possible AML
	opcodes. On the Fujitsu Lifebook E744 this and another bug in
	the parser (incorrect handling of TermArg data types) would lead
	to the laptop not turning off (_S5 not found).

	* grub-core/commands/acpihalt.c: Support OpAlias in the AML parser;
	in skip_ext_op(), handle some Type2Opcodes more correctly (TermArgs
	aren't always simply strings!); Add function to skip TermArgs
	* include/grub/acpi.h: Add new opcodes

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=0f1f95c7b7bc72cfbeea2f6dc5986855738ad96d
Bug-Debian: https://bugs.debian.org/766853
Last-Update: 2016-01-04

Patch-Name: acpihalt-opcodes-1.patch
2016-01-04 13:02:11 +00:00
Hector Marco-Gisbert
832cd1c6c3 Fix security issue when reading username and password
This patch fixes two integer underflows at:
  * grub-core/lib/crypto.c
  * grub-core/normal/auth.c

CVE-2015-8370

Signed-off-by: Hector Marco-Gisbert <hecmargi@upv.es>
Signed-off-by: Ismael Ripoll-Ripoll <iripoll@disca.upv.es>
Also-By: Andrey Borzenkov <arvidjaar@gmail.com>

Bug-Debian: https://bugs.debian.org/808122
Last-Update: 2015-12-16

Patch-Name: CVE-2015-8370.patch
2015-12-16 09:39:53 +00:00
Andrei Borzenkov
1a8eacd20f efinet: enable hardware filters when opening interface
Exclusive open on SNP will close all existing protocol instances which
may disable all receive filters on interface. Reinstall them after we
opened protocol exclusively.

Also follow UEFI specification recommendation and stop interfaces when
closing them:

Unexpected system errors, reboots and hangs can occur if an OS is loaded
and the network devices are not Shutdown() and Stopped().

Also by: Mark Salter <msalter@redhat.com>
Closes: 45204

Patch-Name: efinet-enable-hardware-filters-on-interface.patch
Bug: http://savannah.gnu.org/bugs/?45204
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1521612
Last-Update: 2015-12-03
2015-12-03 10:54:28 -05:00
Andrei Borzenkov
a651971c45 efinet: skip virtual IPv4 and IPv6 devices when enumerating cards
EDK2 PXE driver creates two child devices - IPv4 and IPv6 - with
bound SNP instance. This means we get three cards for every physical
adapter when enumerating. Not only is this confusing, this may result
in grub ignoring packets that come in via the "wrong" card.

Example of device hierarchy is

 Ctrl[91] PciRoot(0x0)/Pci(0x3,0x0)
   Ctrl[95] PciRoot(0x0)/Pci(0x3,0x0)/MAC(525400123456,0x1)
     Ctrl[B4] PciRoot(0x0)/Pci(0x3,0x0)/MAC(525400123456,0x1)/IPv4(0.0.0.0)
     Ctrl[BC] PciRoot(0x0)/Pci(0x3,0x0)/MAC(525400123456,0x1)/IPv6(0000:0000:0000:0000:0000:0000:0000:0000)

Skip PXE created virtual devices when enumerating cards. Make sure to
find real card when applying initial autoconfiguration during PXE boot,
this information is associated with one of child devices.

Patch-Name: efinet-skip-virtual-devices-on-enumeration.patch
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1521612
Last-Update: 2015-12-03
2015-12-03 10:52:46 -05:00
Andrei Borzenkov
c603d4c4d4 efidisk: move device path helpers in core for efinet
Patch-Name: efidisk-device-path-helpers-for-efinet.patch
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1521612
Last-Update: 2015-12-03
2015-12-03 10:50:03 -05:00
Andrei Borzenkov
99d5df3631 efinet: open Simple Network Protocol exclusively
Patch-Name: efinet-open-Simple-Network-Protocol-exclusively.patch
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=49426e9fd2e562c73a4f1206f32eff9e424a1a73
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1508893
Last-Update: 2015-11-25
2015-11-25 16:04:43 +00:00
Paulo Flabiano Smorigo
4b75a4a0f2 ofdisk: add sas disks to the device list
Patch-Name: ofdisk_add_sas_disks.patch
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=c899d9f42c543939abc92d79c9729d429740492e
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1517586
Last-Update: 2015-11-20
2015-11-25 16:04:43 +00:00
Vladimir Serbinenko
80be497baf xfs: Fix handling of symlink with crc-enabled filesystem.
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=049dcfa03c2217f3af9f108d3f41229b8155c534
Last-Update: 2015-11-05

Patch-Name: xfs-crc-fix-symlink.patch
2015-11-25 16:04:43 +00:00
Vladimir Serbinenko
442d2d2861 XFS: Fix wrong alignment treatment.
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=ff3c2007ef22b4385ff189b60aaf1f9de3dff24b
Last-Update: 2015-11-05

Patch-Name: xfs-fix-alignment.patch
2015-11-25 16:04:43 +00:00
Jan Kara
cd6abe82a6 xfs: V5 filesystem format support
Add support for new XFS on disk format. We have to handle optional
filetype fields in directory entries, additional CRC, LSN, UUID entries
in some structures, etc.

Signed-off-by: Jan Kara <jack@suse.cz>

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=b6e80c7778b708c1632d957d00507aad60d9e255
Bug-Debian: https://bugs.debian.org/772565
Last-Update: 2015-11-05

Patch-Name: xfs-v5.patch
2015-11-25 16:04:43 +00:00
Jan Kara
3bfa66ba21 xfs: Add helpers for inode size
Add helpers to return size of XFS inode on disk and when loaded in
memory.

Signed-off-by: Jan Kara <jack@suse.cz>

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=d3ffeb9a9a54148af610cd122028783217d30699
Last-Update: 2015-11-05

Patch-Name: xfs-add-inode-size-helpers.patch
2015-11-25 16:04:42 +00:00
Jan Kara
82f382747d xfs: Convert inode numbers to cpu endianity immediately after reading
Currently XFS driver converted inode numbers to native endianity only
when using them to compute inode position. Although this works, it is
somewhat confusing. So convert inode numbers when reading them from disk
structures as every other field.

Signed-off-by: Jan Kara <jack@suse.cz>

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=a139188eb559ee23f51540948ec84ef5948fb2d1
Last-Update: 2015-11-05

Patch-Name: xfs-simplify-inode-endian-conversion.patch
2015-11-25 16:04:42 +00:00
Jan Kara
7d12bcf99a xfs: Fix termination loop for directory iteration
Directory iteration used wrong position (sizeof wrong structure) for
termination of iteration inside a directory block. Luckily the position
ended up being wrong by just 1 byte and directory entries are larger so
things worked out fine in practice. But fix the problem anyway.

Signed-off-by: Jan Kara <jack@suse.cz>

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=1570140f0362d9936f97a014a9fa5cecbca54f07
Last-Update: 2015-11-05

Patch-Name: xfs-fix-directory-iteration.patch
2015-11-25 16:04:42 +00:00
dann frazier
2252bec27e arm64/setjmp: Add missing license macro
Including the setjmp module in an arm64-efi image will cause it to
immediately exit with an "incompatible license" error.

The source file includes a GPLv3+ boilerplate, so fix this by declaring a
GPLv3+ license using the GRUB_MOD_LICENSE macro.

Signed-off-by: dann frazier <dann.frazier@canonical.com>
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1459871
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=3ac342205dc81293bb8e2d91b8c5ebe124b4ad35

Patch-Name: arm64-setjmp-Add-missing-license-macro.patch
2015-11-25 16:04:42 +00:00
Andrei Borzenkov
2450f1cce1 progress: avoid NULL dereference for net files
From original patch by dann frazier <dann.frazier@canonical.com>:

  grub_net_fs_open() saves off a copy of the file structure it gets passed and
  uses it to create a bufio structure. It then overwrites the passed in file
  structure with this new bufio structure. Since file->name doesn't get set
  until we return back to grub_file_open(), it means that only the bufio
  structure gets a valid file->name. The "real" file's name is left
  uninitialized. This leads to a crash when the progress module hook is called
  on it.

grub_net_fs_open() already saved copy of file name as ->net->name, so change
progress module to use it.

Also, grub_file_open may leave file->name as NULL if grub_strdup fails. Check
for it.

Also-By: dann frazier <dann.frazier@canonical.com>
Patch-Name: progress_avoid_null_deref.patch
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1459872
2015-11-25 16:04:42 +00:00
Leif Lindholm
94e0b1d457 arm64: set correct length of device path end entry
The length of the Device Path End entry in the grub_linux_boot()
function was incorrectly set to 0. This triggers an assert failure
in debug builds of Tianocore.

Set it to sizeof (grub_efi_device_path_t).

Bug-Ubuntu: http://bugs.launchpad.net/bugs/1476882
Origin: http://git.savannah.gnu.org/cgit/grub.git/commit/grub-core/loader/arm64/linux.c?id=4d21c1019904598a991e847eef049c65f9c49bd9
Last-Update: 2015-07-22

Patch-Name: arm64-set-correct-length-of-device-path-end-entry.patch
2015-11-25 16:04:42 +00:00
Paulo Flabiano Smorigo
43a4b86bf4 powerpc: Add a flag to avoid unnecessary optimizations (like vsx)
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1459706
Last-Update: 2015-06-11

Patch-Name: ppc64el-avoid_unnecessary_optimizations.patch
2015-11-25 16:04:42 +00:00
Glenn Washburn
9612078b9b * util/grub-install.c: Fix handling of --disk-module.
Last-Update: 2015-05-19
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1309735
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746596
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=fa33530870839e303354ff2660baeff5356ea736
Patch-Name: fix_disk-module_option_handling.patch
2015-11-25 16:04:42 +00:00
Andrei Borzenkov
6640663a34 diskfilter: fix double free of lv names for mdraid
Avoid micro-optimization in grub_diskfilter_make_raid and make sure
name and fullname are independent strings. This avoids need to special
case it everywhere else.

Also fix memory leak in failure case in grub_diskfilter_make_raid.

Closes: 41582

Last-Update: 2015-05-19
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/grub2/+bug/1330963
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=fc535b32b9fe0cd84213724ffba43b98e2da6ab4
Patch-Name: fix_diskfilter_lv_name_dblfree.patch
2015-11-25 16:04:42 +00:00
Vladimir Serbinenko
9d818510f1 arp, icmp: Fix handling in case of oversized or invalid packets.
This restrict ARP handling to MAC and IP addresses but in practice we need
only this case anyway and other cases are very rar if exist at all. It makes
code much simpler and less error-prone.

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=63034d32612dd34f577605dfa8b417ee9144d8cb
Last-Update: 2015-04-06
Patch-Name: arp_icmp_oversize_handling.patch
2015-11-25 16:04:42 +00:00
Vladimir Serbinenko
899f8e8dc1 Fix UEFI boot failure with some firmware that returns incorrect paths
* grub-core/kern/efi/efi.c: Ensure that the result starts with /
and has no //.

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=7e7293d745ef7c0a13d8cbf12f474843edfdd0ab
Bug-Debian: https://bugs.debian.org/735960
Last-Update: 2015-03-23

Patch-Name: efi_sanitise_path.patch
2015-11-25 16:04:42 +00:00
Colin Watson
946b7eb237 hostfs: Drop unnecessary feature test macros
_BSD_SOURCE was added to allow the use of DT_DIR, but that was removed
in e768b77068.  While adding
_DEFAULT_SOURCE as well works around problems with current glibc,
neither is in fact needed nowadays.

Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=a276b840464629fdaecbe7e813f83a717a34993a
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=5974d4ba65fc5ad9253857bf992ffd3c635baf2a
Last-Update: 2015-03-23

Patch-Name: hostfs_remove_ftm.patch
2015-11-25 16:04:42 +00:00
Steve McIntyre
41f39647ee Add support for running a 64-bit Linux kernel on a 32-bit EFI
Some platforms might be capable of running a 64-bit Linux kernel but
only use a 32-bit EFI.  To support such systems, it is necessary to work
out the size of the firmware rather than just the size of the kernel.
To enable that, there is now an extra EFI sysfs file to describe the
underlying firmware.  Read that if possible, otherwise fall back to the
kernel type as before.

Signed-off-by: Steve McIntyre <93sam@debian.org>

Bug-Debian: https://bugs.debian.org/775202
Forwarded: Not yet
Last-Update: 2015-01-10

Patch-Name: mixed_size_efi.patch
2015-11-25 16:04:42 +00:00
Роман Пехов
b1f7969bc4 * grub-core/commands/loadenv.c (check_blocklists): Fix overlap check.
Bug: http://savannah.gnu.org/bugs/?42134
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1311247
Origin: upstream, http://git.savannah.gnu.org/cgit/grub.git/commit/?id=1f6af2a9f8b02a71f213b4717d8e62c8a6b14fc5
Last-Update: 2015-01-23

Patch-Name: check_blocklists_overlap_fix.patch
2015-11-25 16:04:42 +00:00
Colin Watson
f11cdc39e9 Generate alternative init entries in advanced menu
Add fallback boot entries for alternative installed init systems.  Based
on patches from Michael Biebl and Didier Roche.

Bug-Debian: https://bugs.debian.org/757298
Bug-Debian: https://bugs.debian.org/773173
Forwarded: no
Last-Update: 2015-01-03

Patch-Name: mkconfig_other_inits.patch
2015-11-25 16:04:42 +00:00
Steve McIntyre
57879c9791 Add support for forcing EFI installation to the removable media path
Add an extra option to grub-install "--force-extra-removable". On EFI
platforms, this will cause an extra copy of the grub-efi image to be
written to the appropriate removable media patch
/boot/efi/EFI/BOOT/BOOT$ARCH.EFI as well. This will help with broken
UEFI implementations where the firmware does not work when configured
with new boot paths.

Signed-off-by: Steve McIntyre <93sam@debian.org>

Bug-Debian: https://bugs.debian.org/767037 https://bugs.debian.org/773092
Forwarded: Not yet
Last-Update: 2014-12-20

Patch-Name: grub-install-extra-removable.patch
2015-11-25 16:04:42 +00:00
Ian Campbell
b9fbeea370 Arrange to insmod xzio and lzopio when booting a kernel as a Xen guest
This is needed in case the Linux kernel is compiled with CONFIG_KERNEL_XZ or
CONFIG_KERNEL_LZO rather than CONFIG_KERNEL_GZ (gzio is already loaded by
grub.cfg today).

Signed-off-by: Ian Campbell <ijc@debian.org>

Bug-Debian: https://bugs.debian.org/755256
Forwarded: http://lists.gnu.org/archive/html/grub-devel/2014-11/msg00091.html
Last-Update: 2014-11-30

Patch-Name: insmod-xzio-and-lzopio-on-xen.patch
2015-11-25 16:04:41 +00:00
Andrey Borzenkov
e4917d1a63 Fix typo (gettext_print instead of gettext_printf)
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1390766
Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=c291f47b2c003ef6daeafaedd458db838bad6fb8
Last-Update: 2014-11-18

Patch-Name: gettext-print-typo.patch
2015-11-25 16:04:41 +00:00
Ian Campbell
b9b6bc8b66 grub-install: Install PV Xen binaries into the upstream specified path
Upstream have defined a specification for where guests ought to place their
xenpv grub binaries in order to facilitate chainloading from a stage 1 grub
loaded from dom0.

http://xenbits.xen.org/docs/unstable-staging/misc/x86-xenpv-bootloader.html

The spec calls for installation into /boot/xen/pvboot-i386.elf or
/boot/xen/pvboot-x86_64.elf.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>

Bug-Debian: https://bugs.debian.org/762307
Forwarded: http://lists.gnu.org/archive/html/grub-devel/2014-10/msg00041.html
Last-Update: 2014-10-24

Patch-Name: grub-install-pvxen-paths.patch

---
v2: Respect bootdir, create /boot/xen as needed.
2015-11-25 16:04:41 +00:00
Paulo Flabiano Smorigo
7fdfd21bfa Disable VSX instruction
VSX bit is enabled by default for Power7 and Power8 CPU models,
so we need to disable them in order to avoid instruction exceptions.
Kernel will activate it when necessary.

* grub-core/kern/powerpc/ieee1275/startup.S: Disable VSX.

Also-By: Adhemerval Zanella <azanella@linux.vnet.ibm.com>
Also-By: Colin Watson <cjwatson@debian.org>

Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00078.html
Last-Update: 2015-01-27

Patch-Name: ppc64el-disable-vsx.patch
2015-11-25 16:04:41 +00:00
Paulo Flabiano Smorigo
b53df876c4 Include a text attribute reset in the clear command for ppc
Always clear text attribute for clear command in order to avoid problems
after it boots.

* grub-core/term/terminfo.c: Add escape for text attribute reset

Bug-Ubuntu: https://bugs.launchpad.net/bugs/1295255
Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00076.html
Last-Update: 2014-09-26

Patch-Name: ieee1275-clear-reset.patch
2015-11-25 16:04:41 +00:00
Colin Watson
59feb4a860 Remove .MIPS.abiflags section from images
Recent versions of binutils generate this section, but we don't need it
when producing raw images.

Bug-Debian: https://bugs.debian.org/762307
Forwarded: no
Last-Update: 2014-09-26

Patch-Name: mips-abiflags.patch
2015-11-25 16:04:41 +00:00
Colin Watson
9083cc0a91 Add a new "none" platform that only builds utilities
This makes it possible to build generally-useful utilities such as
grub-mount even if the rest of GRUB has not been ported to the target
CPU.

* configure.ac: Add "none" platform.  Default to it for unsupported
CPUs rather than stopping with a fatal error.  Don't downgrade
x86_64-none to i386.  Define COND_real_platform Automake conditional
if the platform is anything other than "none".  Don't do any include
directory linking for "none".
* Makefile.am: Skip building grub-core and all bootcheck targets if
!COND_real_platform.
* include/grub/time.h: Don't include <grub/cpu/time.h> if GRUB_UTIL
is defined.

Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=5d90f6e533d82abf89f9e1787f90f17f2fab14aa
Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=77063f4cb672f423272db7e21ca448cf3de98dcf
Last-Update: 2014-09-25

Patch-Name: platform-none.patch
2015-11-25 16:04:41 +00:00
Paulo Flabiano Smorigo
354296efcc Skip libgcc dependency for powerpc
* configure.ac: Add conditions to avoid libgcc dependency.
* Makefile.am: Likewise.
* Makefile.core.def: Include compiler-rt.S and compiler-rt.c.
* compiler-rt.c: New file.
* compiler-rt.S: Likewise.
* compiler-rt.h: Likewise.

Also-By: Brent Baude <bbaude@redhat.com>
Also-By: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>

Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00021.html
Last-Update: 2014-09-19

Patch-Name: ppc64el-skip-libgcc.patch
2015-11-25 16:04:41 +00:00
Paulo Flabiano Smorigo
c6007ccf86 Add powerpc little-endian (ppc64le) flags
* configure.ac: Add target for ppc64le (ppc64el).

Origin: other, https://lists.gnu.org/archive/html/grub-devel/2014-09/msg00022.html
Last-Update: 2014-09-19

Patch-Name: ppc64el-flags.patch
2015-11-25 16:04:41 +00:00
Colin Watson
7b883b7a3e Support grub-emu on x32 (ILP32 but with x86-64 instruction set)
* configure.ac: Remove -m64 from checks for -mcmodel=large and
-mno-red-zone.  These are always either unnecessary (x86_64-emu) or
already in TARGET_CFLAGS at this point, and they produce incorrect
results when building for x32.
* grub-core/kern/x86_64/dl.c (grub_arch_dl_relocate_symbols): Cast
pointers to Elf64_Xword via grub_addr_t, in order to work on x32.
* include/grub/x86_64/types.h (GRUB_TARGET_SIZEOF_VOID_P,
GRUB_TARGET_SIZEOF_LONG): Define to 4 on x32.

Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=2a5a532c0047d4eff90175936b220b638cce1013
Bug-Debian: http://bugs.debian.org/760428
Last-Update: 2014-09-07

Patch-Name: x32.patch
2015-11-25 16:04:41 +00:00
Colin Watson
e883ecadcf Fix an infinite loop in grub-mkconfig
* util/grub.d/10_hurd.in: Make kernel list progression not fail on
kernels whose paths contain regex metacharacters.
* util/grub.d/10_kfreebsd.in: Likewise.
* util/grub.d/10_linux.in: Likewise.
* util/grub.d/20_linux_xen.in: Likewise.

Reported by: Heimo Stranner.

Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=0901e7855f922e770cbfeb58262cb8fded518190
Last-Update: 2014-07-08

Patch-Name: mkconfig-kernels-infloop.patch
2015-11-25 16:04:41 +00:00
Dimitri John Ledkov
e3591a59ad Add support for nvme device in grub-mkdevicemap
Author: Colin Watson <cjwatson@ubuntu.com>
Bug-Debian: https://bugs.debian.org/746396
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1275162
Forwarded: no
Last-Update: 2014-05-08

Patch-Name: probe_nvme.patch
2015-11-25 16:04:41 +00:00
Paulo Flabiano Smorigo
ee1df194dd increase network try interval gradually
* grub-core/net/arp.c (grub_net_arp_send_request): Increase network try
interval gradually.
* grub-core/net/icmp6.c (grub_net_icmp6_send_request): Likewise.
* grub-core/net/net.c (grub_net_fs_read_real): Likewise.
* grub-core/net/tftp.c (tftp_open): Likewise.
* include/grub/net.h (GRUB_NET_INTERVAL_ADDITION): New define.

Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=6f65e36cc4f92fe40672181eccf12eac4afb6738
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1314134
Last-Update: 2014-04-29

Patch-Name: net-ramp-up-interval.patch
2015-11-25 16:04:41 +00:00
Paulo Flabiano Smorigo
5e6f0b32f7 change stop condition to avoid infinite loops
In net/net.c there is a while (1) that only exits if there is a stop
condition and more then 10 packages or if there is no package received.

If GRUB is idle and enter in this loop, the only condition to leave is
if it doesn't have incoming packages. In a network with heavy traffic
this never happens.

Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=d99d2f84166b0f60673d5c0714605a153946c0fc
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1314134
Last-Update: 2014-04-29

Patch-Name: net-receive-packets-yield.patch
2015-11-25 16:04:41 +00:00
Colin Watson
97be931877 Tolerate devices with no filesystem UUID returned by os-prober
* util/grub.d/30_os-prober.in: Tolerate devices with no filesystem
UUID.  Other parts of grub-mkconfig tolerate these, they were
previously allowed here up to commit
55e706c918, and they can arise in
practice when the system has active LVM snapshots.
Fixes Ubuntu bug #1287436.

Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=3a310e842fb7a9818c2e7cf0f4118f13660871d2
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1287436
Forwarded: not-needed
Last-Update: 2014-04-10

Patch-Name: tolerate-lvm-snapshots.patch
2015-11-25 16:04:41 +00:00
Thomas Falcon
d771f207d2 btrfs: fix get_root key comparison failures due to endianness
* grub-core/fs/btrfs.c (get_root): Convert
GRUB_BTRFS_ROOT_VOL_OBJECTID to little-endian.

Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=4afd0107efa6a2d9cbe6fc71c529264dc2b9fb8a
Forwarded: not-needed
Last-Update: 2014-03-31

Patch-Name: btrfs-endian.patch
2015-11-25 16:04:41 +00:00
Colin Watson
180b19da23 Fix partmap, cryptodisk, and abstraction handling in grub-mkconfig.
Commit 588744d0dc caused grub-mkconfig
no longer to be forgiving of trailing spaces on grub-probe output
lines, which among other things means that util/grub.d/10_linux.in
no longer detects LVM.  To fix this, make grub-probe's output
delimiting more consistent.  As a bonus, this improves the coverage
of the -0 option.

Fixes Debian bug #735935.

* grub-core/disk/cryptodisk.c
(grub_util_cryptodisk_get_abstraction): Add a user-data argument.
* grub-core/disk/diskfilter.c (grub_diskfilter_get_partmap):
Likewise.
* include/grub/cryptodisk.h (grub_util_cryptodisk_get_abstraction):
Update prototype.
* include/grub/diskfilter.h (grub_diskfilter_get_partmap): Likewise.
* util/grub-install.c (push_partmap_module, push_cryptodisk_module,
probe_mods): Adjust for extra user-data arguments.
* util/grub-probe.c (do_print, probe_partmap, probe_cryptodisk_uuid,
probe_abstraction): Use configured delimiter.  Update callers.

Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=24024dac7f51d3c0df8e1bec63c02d52828de534
Bug-Debian: http://bugs.debian.org/735935
Forwarded: not-needed
Last-Update: 2014-03-31

Patch-Name: probe-delimiter.patch
2015-11-25 16:04:40 +00:00
Nikunj A Dadhania
ba554826cc ieee1275: check for IBM pseries emulated machine
is_qemu is not being set lead to disabling of feature like
GRUB_IEEE1275_FLAG_HAS_CURSORONOFF. This resulted in cursor not being
displayed during the grub-menu edit.

Author: Nikunj A Dadhania <nikunj@linux.vnet.ibm.com>
Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=e4a1fe391906bfcd1a778c5ec4e242c4b07d429d
Forwarded: not-needed
Last-Update: 2014-03-24

Patch-Name: ieee1275-pseries-emulation.patch
2015-11-25 16:04:40 +00:00
Andrey Borzenkov
b3bac73da1 Change grub-mkrescue to use bootaa64.efi too
Origin: upstream, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=e7cfa8d5e1c6d54d40731065e535889b2e8bc9a2
Last-Update: 2014-03-10

Patch-Name: mkrescue_arm64_naming.patch
2015-11-25 16:04:40 +00:00
Andrey Borzenkov
26cb457d5b use {grub,boot}aa64.efi for boot images on AArch64
According to UEFI 2.4 specification, default boot file name on AArch64
is BOOTAA64.EFI (3.4.1.1 Removable Media Boot Behavior). Also set default
GRUB image name to grubaa64.efi to match it.

Origin: backport, http://git.savannah.gnu.org/gitweb/?p=grub.git;a=commitdiff;h=c9e839e2caaf278491f99e7d181cf20dcf5f0b75
Last-Update: 2014-03-10

Patch-Name: install_arm64_naming.patch
2015-11-25 16:04:40 +00:00
Colin Watson
3b48c0a70a Port yaboot logic for various powerpc machine types
Some powerpc machines require not updating the NVRAM.  This can be handled
by existing grub-install command-line options, but it's friendlier to detect
this automatically.

On chrp_ibm machines, use the nvram utility rather than nvsetenv.  (This
is possibly suitable for other machines too, but that needs to be
verified.)

Forwarded: no
Last-Update: 2014-10-15

Patch-Name: install_powerpc_machtypes.patch
2015-11-25 16:04:40 +00:00
Colin Watson
138b440280 Ignore EPERM when modifying kern.geom.debugflags
Many tests fail when run as a non-root user on FreeBSD.  The failures
all amount to an inability to open files using grub_util_fd_open,
because we cannot set the kern.geom.debugflags sysctl.  This sysctl is
indeed important to allow us to do such things as installing GRUB to the
MBR, but if we need to do that and can't then we will get an error
later.  Enforcing it here is unnecessary and prevents otherwise
perfectly reasonable operations.

Forwarded: https://lists.gnu.org/archive/html/grub-devel/2014-01/msg00086.html
Last-Update: 2014-01-17

Patch-Name: freebsd_debugflags_eperm.patch
2015-11-25 16:04:40 +00:00
Colin Watson
caa6b84423 grub-shell: Pass -no-pad to xorriso when building floppy images
The floppy images built by grub-shell are currently just over the
floppy limit, and the Debian patch set plus the 915resolution extra
bring this up to the point where GRUB tries to actually read past
the floppy limit, breaking fddboot_test.  Passing -no-pad buys us
300KiB, which should keep us going for a while.

* tests/util/grub-shell.in: Pass -no-pad to xorriso when building
floppy images, saving 300KiB.

Forwarded: https://lists.gnu.org/archive/html/grub-devel/2014-01/msg00074.html
Last-Update: 2014-01-16

Patch-Name: grub-shell-no-pad.patch
2015-11-25 16:04:40 +00:00
Colin Watson
4eecc4ed9c * Makefile.util.def (grub-macbless): Change mansection to 8.
Patch-Name: macbless_mansection.patch
2015-11-25 16:04:40 +00:00