Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
Please login to access the resource
openSUSE:Step:15
grub2.16182
grub2-efi-HP-workaround.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File grub2-efi-HP-workaround.patch of Package grub2.16182
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; + } } }
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor