diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2026-05-10 06:53:43 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2026-05-10 06:53:43 +0000 |
| commit | 2c151520cf0208b063dedd9f0aeb04eaad54c1af (patch) | |
| tree | ea5e88e2dfbc5adaec5139b75e838d55bb725b4f /sys-apps/systemd | |
| parent | 7f7e3a8f33bbf2fd204e5e9510395a0585591ed5 (diff) | |
| download | baldeagleos-repo-2c151520cf0208b063dedd9f0aeb04eaad54c1af.tar.gz baldeagleos-repo-2c151520cf0208b063dedd9f0aeb04eaad54c1af.tar.xz baldeagleos-repo-2c151520cf0208b063dedd9f0aeb04eaad54c1af.zip | |
Adding metadata
Diffstat (limited to 'sys-apps/systemd')
| -rw-r--r-- | sys-apps/systemd/files/systemd-260.1-gpt-generator.patch | 39 | ||||
| -rw-r--r-- | sys-apps/systemd/systemd-260.1-r1.ebuild (renamed from sys-apps/systemd/systemd-260.1.ebuild) | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/sys-apps/systemd/files/systemd-260.1-gpt-generator.patch b/sys-apps/systemd/files/systemd-260.1-gpt-generator.patch new file mode 100644 index 000000000000..d85bddcdbfc0 --- /dev/null +++ b/sys-apps/systemd/files/systemd-260.1-gpt-generator.patch @@ -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 + diff --git a/sys-apps/systemd/systemd-260.1.ebuild b/sys-apps/systemd/systemd-260.1-r1.ebuild index c04d1a8f16ab..cdc9ae52fd6d 100644 --- a/sys-apps/systemd/systemd-260.1.ebuild +++ b/sys-apps/systemd/systemd-260.1-r1.ebuild @@ -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 |