forked from pool/grub2
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
48 lines
1.3 KiB
Diff
48 lines
1.3 KiB
Diff
From 42cb0ebbffd660608612f9e32150a6596c6933c4 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Mon, 17 Aug 2020 17:25:56 +0800
|
|
Subject: [PATCH 2/2] cmdline: Provide cmdline functions as module
|
|
|
|
The command line processing is needed by many loader modules, hence we should
|
|
make it a sharable one rather than belonging to linux loader. This can cut the
|
|
dependency to linux module among multiple loaders like multiboot linuxefi and
|
|
so on to make custom boot image much more flexible to compose.
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
---
|
|
grub-core/Makefile.core.def | 6 +++++-
|
|
grub-core/lib/cmdline.c | 3 +++
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
--- a/grub-core/Makefile.core.def
|
|
+++ b/grub-core/Makefile.core.def
|
|
@@ -1860,7 +1860,6 @@
|
|
x86_64_efi = loader/efi/linux.c;
|
|
emu = loader/emu/linux.c;
|
|
common = loader/linux.c;
|
|
- common = lib/cmdline.c;
|
|
};
|
|
|
|
module = {
|
|
@@ -2611,3 +2610,8 @@
|
|
efi = commands/bli.c;
|
|
enable = efi;
|
|
};
|
|
+
|
|
+module = {
|
|
+ name = cmdline;
|
|
+ common = lib/cmdline.c;
|
|
+};
|
|
--- a/grub-core/lib/cmdline.c
|
|
+++ b/grub-core/lib/cmdline.c
|
|
@@ -19,6 +19,9 @@
|
|
|
|
#include <grub/lib/cmdline.h>
|
|
#include <grub/misc.h>
|
|
+#include <grub/dl.h>
|
|
+
|
|
+GRUB_MOD_LICENSE ("GPLv3+");
|
|
|
|
static unsigned int check_arg (char *c, int *has_space)
|
|
{
|