mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +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
997 B
Diff
33 lines
997 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Javier Martinez Canillas <javierm@redhat.com>
|
|
Date: Tue, 6 Feb 2018 11:02:09 +0100
|
|
Subject: [PATCH] Remove duplicated grub_exit() definition for grub-emu
|
|
platform
|
|
|
|
The grub_exit() function signature was changed on all platforms to take a
|
|
return code, but latter on a following commit the grub_exit() for the emu
|
|
platform was duplicated. It causes a build error so remove the duplicated
|
|
function definition.
|
|
|
|
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
|
|
---
|
|
grub-core/kern/emu/main.c | 6 ------
|
|
1 file changed, 6 deletions(-)
|
|
|
|
diff --git a/grub-core/kern/emu/main.c b/grub-core/kern/emu/main.c
|
|
index 7e47ec81263..55ea5a11ccd 100644
|
|
--- a/grub-core/kern/emu/main.c
|
|
+++ b/grub-core/kern/emu/main.c
|
|
@@ -72,12 +72,6 @@ grub_exit (int retval __attribute__((unused)))
|
|
grub_reboot ();
|
|
}
|
|
|
|
-void
|
|
-grub_exit (int retval __attribute__((unused)))
|
|
-{
|
|
- grub_reboot ();
|
|
-}
|
|
-
|
|
void
|
|
grub_machine_init (void)
|
|
{
|