58fe9aa736
- Clean up the build a bit to make it faster - Make grubenv work right on UEFI machines Related: rhbz#1119943 - Sort debug and rescue kernels later than normal ones Related: rhbz#1065360 - Allow "fallback" to include entries by title as well as number. Related: rhbz#1026084 - Fix a segfault on aarch64. - Load arm with SB enabled if available. - Add some serial port options to GRUB_MODULES. Signed-off-by: Peter Jones <pjones@redhat.com>
30 lines
966 B
Diff
30 lines
966 B
Diff
From a7a033ed92a55dd44314ed20f720a3d32fa9c684 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Fri, 10 Jan 2014 09:36:24 -0500
|
|
Subject: [PATCH 121/152] Fix grub_script_execute_sourcecode() usage on ppc.
|
|
|
|
593e430c made it not take the extra argc/argv that this code still
|
|
passes it.
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
---
|
|
grub-core/normal/main.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
|
|
index 0da2a52..f66c03c 100644
|
|
--- a/grub-core/normal/main.c
|
|
+++ b/grub-core/normal/main.c
|
|
@@ -289,7 +289,7 @@ grub_normal_execute (const char *config, int nested, int batch)
|
|
if (! grub_ieee1275_cas_reboot (script))
|
|
{
|
|
char *dummy[1] = { NULL };
|
|
- if (! grub_script_execute_sourcecode (script, 0, dummy))
|
|
+ if (! grub_script_execute_sourcecode (script))
|
|
boot = 1;
|
|
}
|
|
grub_free (script);
|
|
--
|
|
1.9.3
|
|
|