diff options
| author |   Sam James <sam@gentoo.org> | 2022-10-14 22:16:07 +0100 |
|---|---|---|
| committer | Sam James <sam@gentoo.org> | 2022-10-14 22:17:57 +0100 |
| commit | 6e4f4fc91a8b855ca96f17481dcdd84fe9d05522 (patch) | |
| tree | 2acd0ae368e9a3f9b1e8ebc1aad24c62b30b1e74 /sys-apps/systemd/files | |
| parent | app-text/poppler-data: Stabilize 0.4.11-r2 hppa, #862133 (diff) | |
| download | gentoo-6e4f4fc91a8b855ca96f17481dcdd84fe9d05522.tar.gz gentoo-6e4f4fc91a8b855ca96f17481dcdd84fe9d05522.tar.bz2 gentoo-6e4f4fc91a8b855ca96f17481dcdd84fe9d05522.zip | |
sys-apps/systemd: add 251.6
Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'sys-apps/systemd/files')
| -rw-r--r-- | sys-apps/systemd/files/251-gpt-auto-no-cryptsetup.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/sys-apps/systemd/files/251-gpt-auto-no-cryptsetup.patch b/sys-apps/systemd/files/251-gpt-auto-no-cryptsetup.patch new file mode 100644 index 000000000000..f56f2febfd2b --- /dev/null +++ b/sys-apps/systemd/files/251-gpt-auto-no-cryptsetup.patch @@ -0,0 +1,28 @@ +https://github.com/systemd/systemd/commit/d0523bb0d12766485fde3b87bb42db8dfc3c45d3 +https://github.com/systemd/systemd/issues/24978 + +From d0523bb0d12766485fde3b87bb42db8dfc3c45d3 Mon Sep 17 00:00:00 2001 +From: David Seifert <soap@gentoo.org> +Date: Wed, 12 Oct 2022 21:47:29 +0200 +Subject: [PATCH] gpt-auto: allow using without cryptsetup + +Fixes #24978 +--- a/src/gpt-auto-generator/gpt-auto-generator.c ++++ b/src/gpt-auto-generator/gpt-auto-generator.c +@@ -571,11 +571,15 @@ static int add_root_rw(DissectedPartition *p) { + + #if ENABLE_EFI + static int add_root_cryptsetup(void) { ++#if HAVE_LIBCRYPTSETUP + + /* If a device /dev/gpt-auto-root-luks appears, then make it pull in systemd-cryptsetup-root.service, which + * sets it up, and causes /dev/gpt-auto-root to appear which is all we are looking for. */ + + return add_cryptsetup("root", "/dev/gpt-auto-root-luks", true, false, NULL); ++#else ++ return 0; ++#endif + } + #endif + + |