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
67 lines
1.6 KiB
Diff
67 lines
1.6 KiB
Diff
From 889c0894d358e48c02f8225426893094f20004e5 Mon Sep 17 00:00:00 2001
|
|
From: Gary Lin <glin@suse.com>
|
|
Date: Thu, 4 Oct 2018 10:32:07 +0800
|
|
Subject: [PATCH] linux/getroot: Support NVDIMM device names
|
|
|
|
There are two types of NVDIMM block devices in linux: fsdax and blk.
|
|
For fsdax, the device name would be /dev/pmemXpY, /dev/pmemXsY,
|
|
/dev/pmemX.YpZ, or /dev/pmemX.YsZ.
|
|
For blk, the name would be /dev/ndblkX.YpZ or /dev/ndblkX.YsZ
|
|
---
|
|
grub-core/osdep/linux/getroot.c | 44 +++++++++++++++++++++++++++++++++
|
|
1 file changed, 44 insertions(+)
|
|
|
|
--- a/grub-core/osdep/linux/getroot.c
|
|
+++ b/grub-core/osdep/linux/getroot.c
|
|
@@ -971,6 +971,50 @@
|
|
*pp = '\0';
|
|
return path;
|
|
}
|
|
+
|
|
+ /* If this is a NVDIMM device in fsdax mode */
|
|
+ if (strncmp ("pmem", p, 4) == 0 && p[4] >= '0' && p[4] <= '9')
|
|
+ {
|
|
+ /* /dev/pmem[0-9]+(\.[0-9]+)?((p[0-9]+)?|s[0-9]*) */
|
|
+ char *pp = strchr (p + 4, 'p');
|
|
+ if (pp)
|
|
+ {
|
|
+ *is_part = 1;
|
|
+ *pp = '\0';
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ pp = strchr (p + 4, 's');
|
|
+ if (pp && pp[1] >= '0' && pp[1] <= '9')
|
|
+ {
|
|
+ *is_part = 1;
|
|
+ pp[1] = '\0';
|
|
+ }
|
|
+ }
|
|
+ return path;
|
|
+ }
|
|
+
|
|
+ /* If this is a NVDIMM device in block mode */
|
|
+ if (strncmp ("ndblk", p, 5) == 0 && p[5] >= '0' && p[5] <= '9')
|
|
+ {
|
|
+ /* /dev/ndblk[0-9]+\.[0-9]+((p[0-9]+)?|s[0-9]*) */
|
|
+ char *pp = strchr (p + 5, 'p');
|
|
+ if (pp)
|
|
+ {
|
|
+ *is_part = 1;
|
|
+ *pp = '\0';
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ pp = strchr (p + 5, 's');
|
|
+ if (pp && pp[1] >= '0' && pp[1] <= '9')
|
|
+ {
|
|
+ *is_part = 1;
|
|
+ pp[1] = '\0';
|
|
+ }
|
|
+ }
|
|
+ return path;
|
|
+ }
|
|
}
|
|
|
|
return path;
|