8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
From d02304f70b5b9c79761d8084ab9dfc66d84688e2 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Wed, 30 Nov 2022 17:02:50 +0800
|
|
Subject: [PATCH] font: Try memdisk fonts with the same name
|
|
|
|
---
|
|
grub-core/font/font.c | 16 +++++++++++++++-
|
|
1 file changed, 15 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/font/font.c b/grub-core/font/font.c
|
|
index 18de52562..92ff415bf 100644
|
|
--- a/grub-core/font/font.c
|
|
+++ b/grub-core/font/font.c
|
|
@@ -451,7 +451,21 @@ grub_font_load (const char *filename)
|
|
#endif
|
|
|
|
if (filename[0] == '(' || filename[0] == '/' || filename[0] == '+')
|
|
- file = grub_buffile_open (filename, GRUB_FILE_TYPE_FONT, 1024);
|
|
+ {
|
|
+ char *n = grub_strdup (filename);
|
|
+ char *p = grub_strrchr (n, '/');
|
|
+ if (p)
|
|
+ {
|
|
+ char *q = grub_strrchr (p, '.');
|
|
+ if (q)
|
|
+ *q = 0;
|
|
+ p++;
|
|
+ file = try_open_from_prefix ("(memdisk)", p);
|
|
+ }
|
|
+ grub_free (n);
|
|
+ if (!file)
|
|
+ file = grub_buffile_open (filename, GRUB_FILE_TYPE_FONT, 1024);
|
|
+ }
|
|
else
|
|
{
|
|
file = try_open_from_prefix ("(memdisk)", filename);
|
|
--
|
|
2.41.0
|
|
|