diff options
author | V3n3RiX <venerix@koprulu.sector> | 2022-10-15 01:47:28 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2022-10-15 01:47:28 +0100 |
commit | f208e35deefe1ee6fe6722cec9ad8cc12e92e638 (patch) | |
tree | f63456d14b948e3a902ace235a9961865728faaf /sys-apps/systemd-utils/files | |
parent | 4392d53af7ce45ccfe6eb14146479ef0e2bd790a (diff) |
gentoo auto-resync : 15:10:2022 - 01:47:28
Diffstat (limited to 'sys-apps/systemd-utils/files')
-rw-r--r-- | sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch b/sys-apps/systemd-utils/files/251-gpt-auto-no-cryptsetup.patch new file mode 100644 index 000000000000..f56f2febfd2b --- /dev/null +++ b/sys-apps/systemd-utils/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 + + |