dcavalca / rpms / grub2

Forked from rpms/grub2 3 years ago
Clone

Blame SOURCES/0121-Fix-grub_script_execute_sourcecode-usage-on-ppc.patch

23d2ea
From c9f932e3dc369211b6e5c2c64c3525a7d4cdd54a Mon Sep 17 00:00:00 2001
606ea6
From: Peter Jones <pjones@redhat.com>
606ea6
Date: Fri, 10 Jan 2014 09:36:24 -0500
27a4da
Subject: [PATCH 121/260] Fix grub_script_execute_sourcecode() usage on ppc.
606ea6
606ea6
593e430c made it not take the extra argc/argv that this code still
606ea6
passes it.
606ea6
606ea6
Signed-off-by: Peter Jones <pjones@redhat.com>
606ea6
---
606ea6
 grub-core/normal/main.c | 2 +-
606ea6
 1 file changed, 1 insertion(+), 1 deletion(-)
606ea6
606ea6
diff --git a/grub-core/normal/main.c b/grub-core/normal/main.c
27a4da
index 0da2a520d..f66c03c4c 100644
606ea6
--- a/grub-core/normal/main.c
606ea6
+++ b/grub-core/normal/main.c
39700a
@@ -289,7 +289,7 @@ grub_normal_execute (const char *config, int nested, int batch)
606ea6
       if (! grub_ieee1275_cas_reboot (script))
606ea6
         {
606ea6
           char *dummy[1] = { NULL };
606ea6
-          if (! grub_script_execute_sourcecode (script, 0, dummy))
606ea6
+          if (! grub_script_execute_sourcecode (script))
606ea6
             boot = 1;
606ea6
         }
606ea6
       grub_free (script);
606ea6
-- 
27a4da
2.13.0
606ea6