62e3547e57
- Version bump to 2.04
* removed
- translations-20170427.tar.xz
* grub2.spec
- Make signed grub-tpm.efi specific to x86_64-efi build, the platform
currently shipped with tpm module from upstream codebase
- Add shim_lock to signed grub.efi in x86_64-efi build
- x86_64: linuxefi now depends on linux, both will verify kernel via
shim_lock
- Remove translation tarball and po file hacks as it's been included in
upstream tarball
* rediff
- grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
- grub2-commands-introduce-read_file-subcommand.patch
- grub2-secureboot-add-linuxefi.patch
- 0001-add-support-for-UEFI-network-protocols.patch
- grub2-efi-HP-workaround.patch
- grub2-secureboot-install-signed-grub.patch
- grub2-linux.patch
- use-grub2-as-a-package-name.patch
- grub2-pass-corret-root-for-nfsroot.patch
- grub2-secureboot-use-linuxefi-on-uefi.patch
- grub2-secureboot-no-insmod-on-sb.patch
- grub2-secureboot-provide-linuxefi-config.patch
- grub2-secureboot-chainloader.patch
- grub2-s390x-01-Changes-made-and-files-added-in-order-to-allow-s390x.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-s390x-04-grub2-install.patch
- grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
- grub2-efi-chainloader-root.patch
OBS-URL: https://build.opensuse.org/request/show/741033
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=340
98 lines
2.4 KiB
Diff
98 lines
2.4 KiB
Diff
|
|
v2: Add GRUB_FILE_TYPE_CONFIG to grub_file_open, see also upstream commit
|
|
ca0a4f689 verifiers: File type for fine-grained signature-verification controlling
|
|
|
|
Index: grub-2.04~rc1/grub-core/kern/efi/init.c
|
|
===================================================================
|
|
--- grub-2.04~rc1.orig/grub-core/kern/efi/init.c
|
|
+++ grub-2.04~rc1/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, GRUB_FILE_TYPE_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, GRUB_FILE_TYPE_CONFIG);
|
|
+
|
|
+ /* 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)
|
|
@@ -72,6 +134,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;
|
|
+ }
|
|
}
|
|
}
|
|
|