]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shared/dissect-image: log messages from cryptsetup
authorTopi Miettinen <toiwoton@gmail.com>
Thu, 2 Apr 2020 13:57:26 +0000 (16:57 +0300)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Fri, 3 Apr 2020 15:44:20 +0000 (17:44 +0200)
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

index f914473a1d36c9e9e8c7a77f5b3b5aa0dd4c7002..23ad6b06cfa9f06ef307fc1798ff9c21d41765fd 100644 (file)
@@ -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;