mirror of
https://github.com/systemd/systemd-stable.git
synced 2025-09-15 13:44:52 +03:00
gpt-auto-generator: don't generate systemd-cryptsetup@.service when --Dlibcryptsetup=false
(cherry picked from commit5b1375035b
) (cherry picked from commitaa6b849087
) (cherry picked from commita4b1e176b2
)
This commit is contained in:
committed by
Zbigniew Jędrzejewski-Szmek
parent
60327e0a52
commit
c22556f7db
@@ -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) {
|
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_free_ char *e = NULL, *n = NULL, *d = NULL;
|
||||||
_cleanup_fclose_ FILE *f = NULL;
|
_cleanup_fclose_ FILE *f = NULL;
|
||||||
int r;
|
int r;
|
||||||
@@ -182,6 +183,9 @@ static int add_cryptsetup(const char *id, const char *what, bool rw, bool requir
|
|||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
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(
|
static int add_mount(
|
||||||
|
Reference in New Issue
Block a user