From c22556f7dba1c0b3d42865b4eb573c7b2f0bb69f Mon Sep 17 00:00:00 2001 From: gaoyi Date: Tue, 6 Apr 2021 10:44:33 +0800 Subject: [PATCH] gpt-auto-generator: don't generate systemd-cryptsetup@.service when --Dlibcryptsetup=false (cherry picked from commit 5b1375035b617bbee8b22a997be527d1b7a392f8) (cherry picked from commit aa6b8490870d3a793becf41cc63479043a934a73) (cherry picked from commit a4b1e176b264f1dc67ef4422d065ae95ecb8c89e) --- src/gpt-auto-generator/gpt-auto-generator.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c index 24d28afc26..cce1bb9f5d 100644 --- a/src/gpt-auto-generator/gpt-auto-generator.c +++ b/src/gpt-auto-generator/gpt-auto-generator.c @@ -105,6 +105,7 @@ static int open_parent_block_device(dev_t devnum, int *ret_fd) { } static int add_cryptsetup(const char *id, const char *what, bool rw, bool require, char **device) { +#if HAVE_LIBCRYPTSETUP _cleanup_free_ char *e = NULL, *n = NULL, *d = NULL; _cleanup_fclose_ FILE *f = NULL; int r; @@ -182,6 +183,9 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, bool requir } return 0; +#else + return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Partition is encrypted, but the project was compiled without libcryptsetup support"); +#endif } static int add_mount( -- 2.25.1