summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Janssen <medhefgo@web.de>2018-06-25 20:33:31 +0200
committerThe Plumber <50238977+systemd-rhel-bot@users.noreply.github.com>2019-12-18 13:25:41 +0100
commit05e184dea3f0182e5787812adfd52b68cff9418d (patch)
treee977940399d8cbacdbbea16076c98bff49ef0ccd
parent9040e15cd3cba546b47aeae0ea133afa1a6ad292 (diff)
downloadsystemd-05e184dea3f0182e5787812adfd52b68cff9418d.tar.gz
crypt-util: Translate libcryptsetup log level instead of using log_debug()
This makes sure that errors reported by libcryptsetup are shown to the user instead of getting swallowed up by log_debug(). (cherry picked from commit aa2cc005d77890b07e8c579f25e1333ff8ba8dac) Resolves: #1776408
-rw-r--r--src/basic/crypt-util.c20
1 files changed, 19 insertions, 1 deletions
diff --git a/src/basic/crypt-util.c b/src/basic/crypt-util.c
index b181ba3ba0..20bdc5489e 100644
--- a/src/basic/crypt-util.c
+++ b/src/basic/crypt-util.c
@@ -5,6 +5,24 @@
#include "log.h"
void cryptsetup_log_glue(int level, const char *msg, void *usrptr) {
- log_debug("%s", msg);
+ switch (level) {
+ case CRYPT_LOG_NORMAL:
+ level = LOG_NOTICE;
+ break;
+ case CRYPT_LOG_ERROR:
+ level = LOG_ERR;
+ break;
+ case CRYPT_LOG_VERBOSE:
+ level = LOG_INFO;
+ break;
+ case CRYPT_LOG_DEBUG:
+ level = LOG_DEBUG;
+ break;
+ default:
+ log_error("Unknown libcryptsetup log level: %d", level);
+ level = LOG_ERR;
+ }
+
+ log_full(level, "%s", msg);
}
#endif