From 1887032f71b00e51d04bb5ae1860d581da786154 Mon Sep 17 00:00:00 2001 From: Topi Miettinen Date: Thu, 2 Apr 2020 16:57:26 +0300 Subject: [PATCH] shared/dissect-image: log messages from cryptsetup Before: ``` write(2, "Device /dev/loop1p1 is too small.\n", 34) = -1 ENOTCONN (Transport endpoint is not connected) ``` After: ``` $ journalctl -b -e | grep 'too small' Apr 02 16:53:30 loora systemd[343579]: Device /dev/loop1p1 is too small. ``` --- src/shared/dissect-image.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index f914473a1d..23ad6b06cf 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -1188,6 +1188,8 @@ static int decrypt_partition( if (r < 0) return log_debug_errno(r, "Failed to initialize dm-crypt: %m"); + crypt_set_log_callback(cd, cryptsetup_log_glue, NULL); + r = crypt_load(cd, CRYPT_LUKS, NULL); if (r < 0) return log_debug_errno(r, "Failed to load LUKS metadata: %m"); @@ -1246,6 +1248,8 @@ static int verity_partition( if (r < 0) return r; + crypt_set_log_callback(cd, cryptsetup_log_glue, NULL); + r = crypt_load(cd, CRYPT_VERITY, NULL); if (r < 0) return r; -- 2.25.1