Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package fde-tools for openSUSE:Factory
checked in at 2023-07-07 15:49:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/fde-tools (Old)
and /work/SRC/openSUSE:Factory/.fde-tools.new.23466 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fde-tools"
Fri Jul 7 15:49:52 2023 rev:3 rq:1097489 version:0.6.5
Changes:
--------
--- /work/SRC/openSUSE:Factory/fde-tools/fde-tools.changes 2023-07-04
15:22:10.722133068 +0200
+++ /work/SRC/openSUSE:Factory/.fde-tools.new.23466/fde-tools.changes
2023-07-07 15:52:45.082137152 +0200
@@ -1,0 +2,9 @@
+Fri Jul 7 08:40:25 UTC 2023 - Gary Ching-Pang Lin <g...@suse.com>
+
+- Add fde-tools-fix-bootloader-func.patch
+ + Define the bootloader specific functions in the firstboot
+ script since the aliases are not expanded
+- Add fde-tools-force-dracut.patch
+ + Always regenerate initrd
+
+-------------------------------------------------------------------
New:
----
fde-tools-fix-bootloader-func.patch
fde-tools-force-dracut.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ fde-tools.spec ++++++
--- /var/tmp/diff_new_pack.6VRfdv/_old 2023-07-07 15:52:45.550139940 +0200
+++ /var/tmp/diff_new_pack.6VRfdv/_new 2023-07-07 15:52:45.554139964 +0200
@@ -27,6 +27,8 @@
Source1: fde-tools.service
Patch: fde-tools-firstboot-alp-snapshot.patch
Patch1: fde-tools-avoid-cleaning-temp-dir.patch
+Patch2: fde-tools-fix-bootloader-func.patch
+Patch3: fde-tools-force-dracut.patch
BuildRequires: help2man
BuildRequires: openssl >= 0.9.8
BuildRequires: tpm2-0-tss-devel
++++++ fde-tools-fix-bootloader-func.patch ++++++
>From 97336e85f6f271891f8b1ddb5ae04935c0d80fae Mon Sep 17 00:00:00 2001
From: Gary Lin <g...@suse.com>
Date: Fri, 7 Jul 2023 16:36:00 +0800
Subject: [PATCH] firstboot/fde: forcefully invoke dracut
To make sure the initrd is always recreated, specify '--force' to
dracut.
Signed-off-by: Gary Lin <g...@suse.com>
---
firstboot/fde | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/firstboot/fde b/firstboot/fde
index 157a9bd..f1a95ab 100755
--- a/firstboot/fde
+++ b/firstboot/fde
@@ -206,7 +206,7 @@ function fde_setup_unencrypted {
rm -f /etc/crypttab
display_infobox "Re-creating initial ramdisk"
- if ! dracut >&2; then
+ if ! dracut --force >&2; then
display_errorbox "Failed to rebuild initrd"
return 1
fi
--
2.35.3
++++++ fde-tools-force-dracut.patch ++++++
>From 346e41ac7d9e5b1b37dd3e315078b99c58f59799 Mon Sep 17 00:00:00 2001
From: Gary Lin <g...@suse.com>
Date: Fri, 7 Jul 2023 16:31:31 +0800
Subject: [PATCH] firstboot/fde: use functions as the aliases for bootloader
functions
Aliases are not expanded in non-interactive mode by default, so those
function aliases defined in the 'grub2' script won't work for firstboot.
Manually define the bootloader specific functions in firstboot/fde to
avoid the potential 'command not found' error.
Signed-off-by: Gary Lin <g...@suse.com>
---
firstboot/fde | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/firstboot/fde b/firstboot/fde
index 530baed..157a9bd 100755
--- a/firstboot/fde
+++ b/firstboot/fde
@@ -38,6 +38,27 @@ fi
##################################################################
KIWI_ROOT_KEYFILE=/root/.root.keyfile
+##################################################################
+# Aliases are not expanded in non-interactive mode.
+# Set the bootloader specific functions here as aliases
+##################################################################
+
+function bootloader_enable_fde_pcr_policy {
+ grub_enable_fde_pcr_policy "$@"
+}
+
+function bootloader_enable_fde_without_tpm {
+ grub_enable_fde_without_tpm "$@"
+}
+
+function bootloader_get_fde_password {
+ grub_get_fde_password "$@"
+}
+
+##################################################################
+# FDE Firstboot functions
+##################################################################
+
function fde_protect_tpm {
local luks_dev=$1
--
2.35.3
