From df2452c553da3004b1c3d276fa7e3de24aac330f Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Sat, 6 Jul 2019 13:47:06 +0300 Subject: [PATCH 1/4] basic/log: fix SYSTEMD_LOG_* parsing error messages (likely a copy-paste gone wrong) --- src/basic/log.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/basic/log.c b/src/basic/log.c index a81c350ab4..c484ff57f6 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -1110,11 +1110,11 @@ void log_parse_environment_realm(LogRealm realm) { e = getenv("SYSTEMD_LOG_COLOR"); if (e && log_show_color_from_string(e) < 0) - log_warning("Failed to parse bool '%s'. Ignoring.", e); + log_warning("Failed to parse log color '%s'. Ignoring.", e); e = getenv("SYSTEMD_LOG_LOCATION"); if (e && log_show_location_from_string(e) < 0) - log_warning("Failed to parse bool '%s'. Ignoring.", e); + log_warning("Failed to parse log location '%s'. Ignoring.", e); } LogTarget log_get_target(void) { From 8c71b2cd449e89ba681ff708b77ffd87b1ff4f01 Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Sat, 6 Jul 2019 13:48:50 +0300 Subject: [PATCH 2/4] cryptsetup: set libcryptsetup global log callback too --- src/cryptsetup/cryptsetup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index a001ac7506..54c787857d 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -637,6 +637,7 @@ static int run(int argc, char *argv[]) { log_setup_service(); + crypt_set_log_callback(NULL, cryptsetup_log_glue, NULL); umask(0022); if (streq(argv[1], "attach")) { From 568a84048e7140223df46cfd581e75b4c0633079 Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Sat, 6 Jul 2019 13:51:23 +0300 Subject: [PATCH 3/4] cryptsetup: enable libcryptsetup debug logging if we want it Even if we set a log callback that would accept debug messages, libcryptsetup needs debug logging enabled explicitly for it to happen. --- src/cryptsetup/cryptsetup.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c index 54c787857d..02f131086b 100644 --- a/src/cryptsetup/cryptsetup.c +++ b/src/cryptsetup/cryptsetup.c @@ -638,6 +638,10 @@ static int run(int argc, char *argv[]) { log_setup_service(); crypt_set_log_callback(NULL, cryptsetup_log_glue, NULL); + if (DEBUG_LOGGING) + /* libcryptsetup won't even consider debug messages by default */ + crypt_set_debug_level(CRYPT_DEBUG_ALL); + umask(0022); if (streq(argv[1], "attach")) { From ac8bb308b711499632f6f456d7d298bdcd24b14e Mon Sep 17 00:00:00 2001 From: Ivan Shapovalov Date: Sat, 6 Jul 2019 13:51:55 +0300 Subject: [PATCH 4/4] growfs: call crypt_set_debug_level() correctly, skip if not needed --- src/partition/growfs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/partition/growfs.c b/src/partition/growfs.c index ce86f96e13..9e7178ac45 100644 --- a/src/partition/growfs.c +++ b/src/partition/growfs.c @@ -129,7 +129,8 @@ static int maybe_resize_slave_device(const char *mountpath, dev_t main_devno) { #if HAVE_LIBCRYPTSETUP crypt_set_log_callback(NULL, cryptsetup_log_glue, NULL); - crypt_set_debug_level(1); + if (DEBUG_LOGGING) + crypt_set_debug_level(CRYPT_DEBUG_ALL); #endif r = get_block_device_harder(mountpath, &devno);