2018-07-12 14:56:34 +00:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
2018-07-11 18:39:49 +00:00
|
|
|
From: Peter Jones <pjones@redhat.com>
|
|
|
|
|
Date: Wed, 11 Jul 2018 13:47:56 -0400
|
|
|
|
|
Subject: [PATCH] Disable the reboot module on EFI builds; it is in kernel.
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
|
|
---
|
|
|
|
|
grub-core/Makefile.core.def | 7 +++++--
|
|
|
|
|
1 file changed, 5 insertions(+), 2 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/grub-core/Makefile.core.def b/grub-core/Makefile.core.def
|
|
|
|
|
index a656930800e..3b022555c46 100644
|
|
|
|
|
--- a/grub-core/Makefile.core.def
|
|
|
|
|
+++ b/grub-core/Makefile.core.def
|
|
|
|
|
@@ -192,6 +192,7 @@ kernel = {
|
|
|
|
|
i386_coreboot_multiboot_qemu = term/i386/pc/vga_text.c;
|
|
|
|
|
coreboot = video/coreboot/cbfb.c;
|
|
|
|
|
|
|
|
|
|
+ efi = commands/reboot.c;
|
|
|
|
|
efi = disk/efi/efidisk.c;
|
|
|
|
|
efi = kern/efi/efi.c;
|
|
|
|
|
efi = kern/efi/init.c;
|
|
|
|
|
@@ -890,8 +891,8 @@ module = {
|
|
|
|
|
|
|
|
|
|
module = {
|
|
|
|
|
name = reboot;
|
|
|
|
|
- i386 = lib/i386/reboot.c;
|
|
|
|
|
- i386 = lib/i386/reboot_trampoline.S;
|
|
|
|
|
+ i386_pc = lib/i386/reboot.c;
|
|
|
|
|
+ i386_pc = lib/i386/reboot_trampoline.S;
|
|
|
|
|
powerpc_ieee1275 = lib/ieee1275/reboot.c;
|
|
|
|
|
sparc64_ieee1275 = lib/ieee1275/reboot.c;
|
|
|
|
|
mips_arc = lib/mips/arc/reboot.c;
|
|
|
|
|
@@ -901,6 +902,8 @@ module = {
|
|
|
|
|
uboot = lib/uboot/reboot.c;
|
|
|
|
|
arm_coreboot = lib/dummy/reboot.c;
|
|
|
|
|
common = commands/reboot.c;
|
|
|
|
|
+
|
|
|
|
|
+ disable = efi;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
module = {
|
