bed96b70e1
- Fix config_directory on btrfs to follow path scheme (bsc#1063443) * grub2-btrfs-10-config-directory.patch - Fix grub2-install --root-directory does not work for /boot/grub2/<arch> on separate btrfs subvolume (boo#1098420) * grub2-btrfs-06-subvol-mount.patch - Fix setparams doesn't work as expected from boot-last-label NVRAM var, after inital CAS reboot on ieee1275 (bsc#1088830) * grub2-ppc64-cas-new-scope.patch OBS-URL: https://build.opensuse.org/request/show/624960 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=308
18 lines
623 B
Diff
18 lines
623 B
Diff
Index: grub-2.02/grub-core/normal/main.c
|
|
===================================================================
|
|
--- grub-2.02.orig/grub-core/normal/main.c
|
|
+++ grub-2.02/grub-core/normal/main.c
|
|
@@ -282,10 +282,11 @@ grub_normal_execute (const char *config,
|
|
int boot;
|
|
boot = 0;
|
|
char *script;
|
|
+ char *dummy[1] = { NULL };
|
|
script = grub_malloc (1024);
|
|
if (! grub_ieee1275_cas_reboot (script))
|
|
{
|
|
- if (! grub_script_execute_sourcecode (script))
|
|
+ if (! grub_script_execute_new_scope (script, 0, dummy))
|
|
boot = 1;
|
|
}
|
|
grub_free (script);
|