grub2/0033-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch
Peter Jones f4c76c02ae Reconcile even harder, so that it actually works.
Signed-off-by: Peter Jones <pjones@redhat.com>
2015-07-22 13:12:37 -04:00

29 lines
964 B
Diff

From 72f5fd673e63802ff829570395d9c7d950b30f52 Mon Sep 17 00:00:00 2001
From: Peter Jones <pjones@redhat.com>
Date: Fri, 10 Jan 2014 09:36:24 -0500
Subject: [PATCH 33/74] 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 725e441..d98e868 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);
--
2.4.3