forked from pool/grub2
3e026f665c
- Add safety measure to pcr snapshot by checking platform and tpm status * safe_tpm_pcr_snapshot.patch - Fix installation failure due to unavailable nvram device on ppc64le (bsc#1201361) * 0001-grub-install-set-point-of-no-return-for-powerpc-ieee1275.patch - Add patches to dynamically allocate additional memory regions for EFI systems (bsc#1202438) * 0001-mm-Allow-dynamically-requesting-additional-memory-re.patch * 0002-kern-efi-mm-Always-request-a-fixed-number-of-pages-o.patch * 0003-kern-efi-mm-Extract-function-to-add-memory-regions.patch * 0004-kern-efi-mm-Pass-up-errors-from-add_memory_regions.patch * 0005-kern-efi-mm-Implement-runtime-addition-of-pages.patch - Enlarge the default heap size and defer the disk cache invalidation (bsc#1202438) * 0001-kern-efi-mm-Enlarge-the-default-heap-size.patch * 0002-mm-Defer-the-disk-cache-invalidation.patch - Add patches for ALP FDE support * 0001-devmapper-getroot-Have-devmapper-recognize-LUKS2.patch * 0002-devmapper-getroot-Set-up-cheated-LUKS2-cryptodisk-mo.patch * 0003-disk-cryptodisk-When-cheatmounting-use-the-sector-in.patch * 0004-normal-menu-Don-t-show-Booting-s-msg-when-auto-booti.patch * 0005-EFI-suppress-the-Welcome-to-GRUB-message-in-EFI-buil.patch * 0006-EFI-console-Do-not-set-colorstate-until-the-first-te.patch * 0007-EFI-console-Do-not-set-cursor-until-the-first-text-o.patch * 0008-linuxefi-Use-common-grub_initrd_load.patch * 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch * 0010-templates-import-etc-crypttab-to-grub.cfg.patch OBS-URL: https://build.opensuse.org/request/show/1004537 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=419
82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
From 2d3130c289b293269dcf558a26674f83f77729a6 Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Tue, 14 Jun 2022 17:10:01 +0800
|
|
Subject: [PATCH 10/10] templates: import /etc/crypttab to grub.cfg
|
|
|
|
The /etc/crypptab is used to setup location of encryption key files during
|
|
boot, among other things. It is useful to make use the information by grub to
|
|
determine where keys are being looked up.
|
|
|
|
This script can be used to import relevant /etc/crypptab entry to grub.cfg.
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
---
|
|
Makefile.util.def | 7 +++++++
|
|
util/grub.d/05_crypttab.in | 36 ++++++++++++++++++++++++++++++++++++
|
|
2 files changed, 43 insertions(+)
|
|
create mode 100644 util/grub.d/05_crypttab.in
|
|
|
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
|
index 08f681cd8b..5e0ba22f3d 100644
|
|
--- a/Makefile.util.def
|
|
+++ b/Makefile.util.def
|
|
@@ -476,6 +476,13 @@ script = {
|
|
installdir = grubconf;
|
|
};
|
|
|
|
+script = {
|
|
+ name = '05_crypttab';
|
|
+ common = util/grub.d/05_crypttab.in;
|
|
+ installdir = grubconf;
|
|
+ condition = COND_HOST_LINUX;
|
|
+};
|
|
+
|
|
script = {
|
|
name = '10_windows';
|
|
common = util/grub.d/10_windows.in;
|
|
diff --git a/util/grub.d/05_crypttab.in b/util/grub.d/05_crypttab.in
|
|
new file mode 100644
|
|
index 0000000000..c539bc061e
|
|
--- /dev/null
|
|
+++ b/util/grub.d/05_crypttab.in
|
|
@@ -0,0 +1,36 @@
|
|
+#! /bin/sh
|
|
+set -e
|
|
+
|
|
+# grub-mkconfig helper script.
|
|
+# Copyright (C) 2022 Free Software Foundation, Inc.
|
|
+#
|
|
+# GRUB is free software: you can redistribute it and/or modify
|
|
+# it under the terms of the GNU General Public License as published by
|
|
+# the Free Software Foundation, either version 3 of the License, or
|
|
+# (at your option) any later version.
|
|
+#
|
|
+# GRUB is distributed in the hope that it will be useful,
|
|
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
+# GNU General Public License for more details.
|
|
+#
|
|
+# You should have received a copy of the GNU General Public License
|
|
+# along with GRUB. If not, see <http://www.gnu.org/licenses/>.
|
|
+
|
|
+prefix="@prefix@"
|
|
+exec_prefix="@exec_prefix@"
|
|
+datarootdir="@datarootdir@"
|
|
+
|
|
+export TEXTDOMAIN=@PACKAGE@
|
|
+export TEXTDOMAINDIR="@localedir@"
|
|
+
|
|
+. "$pkgdatadir/grub-mkconfig_lib"
|
|
+
|
|
+CRYPTTAB=/etc/crypttab
|
|
+
|
|
+if [ -r "$CRYPTTAB" ]; then
|
|
+ awk '/UUID=/ { sub(/UUID=/,"",$2); \
|
|
+ gsub(/-/,"",$2); \
|
|
+ printf("crypttab_entry %s %s %s\n",$1,$2,$3) \
|
|
+ }' "$CRYPTTAB"
|
|
+fi
|
|
--
|
|
2.34.1
|
|
|