gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-08-24 06:48:18 -07:00
Code Issues Projects Releases Wiki Activity

sys-apps/systemd: fix gpt-auto-generator w/o cryptsetup

Browse Source 
Closes: https://bugs.gentoo.org/973136
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2026-05-09 22:01:58 +01:00
parent 71c778668f
commit 050f156361
2 changed files with 40 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
sys-apps/systemd/files/systemd-260.1-gpt-generator.patch Normal file
View File

@@ -0,0 +1,39 @@
https://bugs.gentoo.org/973136
https://github.com/systemd/systemd/issues/41749
https://github.com/systemd/systemd/pull/41756
https://github.com/systemd/systemd/commit/1d78c2d327cbd4e738d0f1281a976a771f643517
From 1d78c2d327cbd4e738d0f1281a976a771f643517 Mon Sep 17 00:00:00 2001
From: Nandakumar Raghavan <naraghavan@microsoft.com>
Date: Tue, 21 Apr 2026 13:14:17 +0000
Subject: [PATCH] gpt-auto-generator: do not fail on missing libcryptsetup when
verity is not used
add_veritysetup() is called unconditionally from add_root_mount() and
add_usr_mount() whenever in_initrd() is true, to generate units that
only activate if verity devices appear. However, when compiled without
libcryptsetup, this function returned a hard error, causing the entire
generator to fail even when no verity protection is in use.
Change the #else fallback to log a debug message and return 0, matching
the pattern already used by add_root_cryptsetup().
---
src/gpt-auto-generator/gpt-auto-generator.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 6716a8d1aaf7c..abbb955e5992e 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -295,8 +295,8 @@ static int add_veritysetup(
return 0;
#else
- return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
- "Partition is Verity protected, but systemd-gpt-auto-generator was compiled without libcryptsetup support.");
+ log_warning("Compiled without libcryptsetup support, skipping verity setup for '%s'.", id);
+ return 0;
#endif
}
#endif

1
sys-apps/systemd/systemd-260.1.ebuild → sys-apps/systemd/systemd-260.1-r1.ebuild
View File

@@ -258,6 +258,7 @@ src_prepare() {
"${FILESDIR}/systemd-260.1-fuzz-journald.patch"
"${FILESDIR}/systemd-260.1-openssl-4.patch"
"${FILESDIR}/systemd-260.1-gcc-17.patch"
"${FILESDIR}/systemd-260.1-gpt-generator.patch"
)
if ! use vanilla; then