dasharo/systemd
0
0
Fork 0
mirror of https://github.com/Dasharo/systemd.git synced 2026-03-06 15:02:31 -08:00
Code Issues Packages Projects Releases Wiki Activity

{crypt|verity}setup: mention volume name in some error messages

Browse Source
This commit is contained in:
Lennart Poettering
2023-06-01 15:31:25 +02:00
parent ce49a479d2
commit ffe0da297d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/cryptsetup/cryptsetup.c
View File

@@ -2324,13 +2324,13 @@ static int run(int argc, char *argv[]) {
return 0;
}
if (r < 0)
return log_error_errno(r, "crypt_init_by_name() failed: %m");
return log_error_errno(r, "crypt_init_by_name() for volume '%s' failed: %m", volume);
cryptsetup_enable_logging(cd);
r = crypt_deactivate(cd, volume);
if (r < 0)
return log_error_errno(r, "Failed to deactivate: %m");
return log_error_errno(r, "Failed to deactivate '%s': %m", volume);
} else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown verb %s.", verb);

8
src/veritysetup/veritysetup.c
View File

@@ -398,7 +398,7 @@ static int run(int argc, char *argv[]) {
} else
r = crypt_activate_by_volume_key(cd, volume, m, l, arg_activate_flags);
if (r < 0)
return log_error_errno(r, "Failed to set up verity device: %m");
return log_error_errno(r, "Failed to set up verity device '%s': %m", volume);
} else if (streq(verb, "detach")) {
const char *volume;
@@ -410,17 +410,17 @@ static int run(int argc, char *argv[]) {
r = crypt_init_by_name(&cd, volume);
if (r == -ENODEV) {
log_info("Volume %s already inactive.", volume);
log_info("Volume %s 'already' inactive.", volume);
return 0;
}
if (r < 0)
return log_error_errno(r, "crypt_init_by_name() failed: %m");
return log_error_errno(r, "crypt_init_by_name() for volume '%s' failed: %m", volume);
cryptsetup_enable_logging(cd);
r = crypt_deactivate(cd, volume);
if (r < 0)
return log_error_errno(r, "Failed to deactivate: %m");
return log_error_errno(r, "Failed to deactivate volume '%s': %m", volume);
} else
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Unknown verb %s.", verb);