projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
64c5974
)
Fix error building repart with no libcryptsetup (#20739)
author
Marcus Harrison
<marcus@harrisonland.co.uk>
Wed, 15 Sep 2021 01:55:07 +0000
(
03:55
+0200)
committer
Zbigniew Jędrzejewski-Szmek
<zbyszek@in.waw.pl>
Tue, 12 Oct 2021 14:58:49 +0000
(16:58 +0200)
(cherry picked from commit
2709d02906dd3ab5ecc2b3e19e2846b1714a7e5a
)
src/partition/repart.c
patch
|
blob
|
history
diff --git
a/src/partition/repart.c
b/src/partition/repart.c
index 589acaa49d775db0c4e8b28aa95425a0400a709f..851c68cc4bbfe2a6d52956a28b83850b423ac8bb 100644
(file)
--- a/
src/partition/repart.c
+++ b/
src/partition/repart.c
@@
-206,7
+206,12
@@
static const char *encrypt_mode_table[_ENCRYPT_MODE_MAX] = {
[ENCRYPT_KEY_FILE_TPM2] = "key-file+tpm2",
};
+#if HAVE_LIBCRYPTSETUP
DEFINE_PRIVATE_STRING_TABLE_LOOKUP_WITH_BOOLEAN(encrypt_mode, EncryptMode, ENCRYPT_KEY_FILE);
+#else
+DEFINE_PRIVATE_STRING_TABLE_LOOKUP_FROM_STRING_WITH_BOOLEAN(encrypt_mode, EncryptMode, ENCRYPT_KEY_FILE);
+#endif
+
static uint64_t round_down_size(uint64_t v, uint64_t p) {
return (v / p) * p;