forked from pool/grub2
49eb9d2678
- new upstream version 2.02~beta3
* highlights of user visible changes not yet present in openSUSE package
- arm-uboot now generates position independent self relocating image, so
single binary should run on all supported systems
- loader for Xen on aarch64. grub-mkconfig support was not in time for
beta3 yet.
- improved ZFS support (extensible_dataset, large_blocks, embedded_data,
hole_birth features)
- support for IPv6 Router Advertisements
- support for persistent memory (we do not overwrite it and pass correct
information to OS)
- try to display more specific icons for os-prober generated menu entries
- grub-install detects EFI bit size and selects correct platform (x86_64-efi
or i386-efi) independent of OS bit size; needs kernel 4.0 or higher.
- LVM RAID1 support
- xnu loader fixes which should make OS X menu entry generated by os-prober
work again
- ... and lot of fixes over entire tree
OBS-URL: https://build.opensuse.org/request/show/362771
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=205
94 lines
2.2 KiB
Diff
94 lines
2.2 KiB
Diff
Index: grub-2.02~beta2/grub-core/kern/efi/init.c
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/grub-core/kern/efi/init.c
|
|
+++ grub-2.02~beta2/grub-core/kern/efi/init.c
|
|
@@ -25,6 +25,7 @@
|
|
#include <grub/env.h>
|
|
#include <grub/mm.h>
|
|
#include <grub/kernel.h>
|
|
+#include <grub/file.h>
|
|
|
|
grub_addr_t grub_modbase;
|
|
|
|
@@ -48,6 +49,67 @@ grub_efi_init (void)
|
|
void (*grub_efi_net_config) (grub_efi_handle_t hnd,
|
|
char **device,
|
|
char **path);
|
|
+static char *
|
|
+workaround_efi_firmware_path (const char *device, const char *path)
|
|
+{
|
|
+ char *config = NULL;;
|
|
+ char *config_upper = NULL;
|
|
+ char *path_upper = NULL;
|
|
+ char *ret_path = NULL;
|
|
+ grub_file_t config_fd = NULL;
|
|
+ char *s;
|
|
+
|
|
+ if (!device || !path)
|
|
+ return NULL;
|
|
+
|
|
+ /* only workaround if booting off from cd device */
|
|
+ if (grub_strncmp (device, "cd", 2) != 0)
|
|
+ goto quit;
|
|
+
|
|
+ config = grub_xasprintf ("(%s)%s/grub.cfg", device, path);
|
|
+ config_fd = grub_file_open (config);
|
|
+
|
|
+ /* everything's fine, so quit the workaround */
|
|
+ if (config_fd)
|
|
+ goto quit;
|
|
+
|
|
+ /* reset grub error state because noone else does... */
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+
|
|
+ /* try again, this time upper case path */
|
|
+ path_upper = grub_strdup (path);
|
|
+ if (! path_upper)
|
|
+ goto quit;
|
|
+
|
|
+ s = path_upper;
|
|
+ for (; *s; s++) *s = grub_toupper(*s);
|
|
+
|
|
+ config_upper = grub_xasprintf ("(%s)%s/grub.cfg", device, path_upper);
|
|
+ if (! config_upper)
|
|
+ goto quit;
|
|
+
|
|
+ config_fd = grub_file_open (config_upper);
|
|
+
|
|
+ /* if config can be found by the upper case path, return it */
|
|
+ if (config_fd)
|
|
+ ret_path = grub_strdup (path_upper);
|
|
+
|
|
+quit:
|
|
+
|
|
+ if (config_fd)
|
|
+ grub_file_close (config_fd);
|
|
+
|
|
+ if (grub_errno)
|
|
+ grub_errno = GRUB_ERR_NONE;
|
|
+
|
|
+ if (config)
|
|
+ grub_free (config);
|
|
+
|
|
+ if (config_upper)
|
|
+ grub_free (config_upper);
|
|
+
|
|
+ return ret_path;
|
|
+}
|
|
|
|
void
|
|
grub_machine_get_bootlocation (char **device, char **path)
|
|
@@ -69,6 +131,12 @@ grub_machine_get_bootlocation (char **de
|
|
p = grub_strrchr (*path, '/');
|
|
if (p)
|
|
*p = '\0';
|
|
+
|
|
+ if ((p = workaround_efi_firmware_path (*device, *path)))
|
|
+ {
|
|
+ grub_free (*path);
|
|
+ *path = p;
|
|
+ }
|
|
}
|
|
}
|
|
|