mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-18 09:51:50 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
33 lines
915 B
Diff
33 lines
915 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Wed, 11 Jul 2018 13:48:48 -0400
|
|
Subject: [PATCH] Disable multiboot, multiboot2, and linux16 modules on EFI
|
|
builds.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/Makefile.core.def | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
index aa44d66aca4..d3e3bfd4d7a 100644
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -1680,7 +1680,7 @@ module = {
|
|
|
|
common = loader/multiboot.c;
|
|
common = loader/multiboot_mbi2.c;
|
|
- enable = x86;
|
|
+ enable = i386_pc;
|
|
enable = mips;
|
|
};
|
|
|
|
@@ -1689,7 +1689,7 @@ module = {
|
|
common = loader/multiboot.c;
|
|
x86 = loader/i386/multiboot_mbi.c;
|
|
extra_dist = loader/multiboot_elfxx.c;
|
|
- enable = x86;
|
|
+ enable = i386_pc;
|
|
};
|
|
|
|
module = {
|