diff options
| author | Milan Broz <gmazyland@gmail.com> | 2023-11-29 09:21:01 +0100 |
|---|---|---|
| committer | Milan Broz <gmazyland@gmail.com> | 2023-11-29 09:21:01 +0100 |
| commit | 5d50617594757bcc53db909075aab573220bc435 (patch) | |
| tree | e2b8c8b4ddc0d82bea646c61e11c82a3ddcf2385 | |
| parent | cea9c2972e42a26eb1c06c7e5af1587c1ce74f24 (diff) | |
| download | cryptsetup-5d50617594757bcc53db909075aab573220bc435.tar.gz | |
Tweak some error messages.
| -rw-r--r-- | lib/luks2/luks2_reencrypt.c | 3 | ||||
| -rw-r--r-- | lib/setup.c | 6 | ||||
| -rw-r--r-- | src/cryptsetup.c | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/lib/luks2/luks2_reencrypt.c b/lib/luks2/luks2_reencrypt.c index f440d34b..456501c8 100644 --- a/lib/luks2/luks2_reencrypt.c +++ b/lib/luks2/luks2_reencrypt.c @@ -3875,7 +3875,8 @@ int crypt_reencrypt_init_by_keyring(struct crypt_device *cd, r = crypt_keyring_get_user_key(cd, passphrase_description, &passphrase, &passphrase_size); if (r < 0) { - log_err(cd, _("Failed to read passphrase from keyring (error %d)."), r); + log_dbg(cd, "crypt_keyring_get_user_key failed (error %d)", r); + log_err(cd, _("Failed to read passphrase from keyring.")); return -EINVAL; } diff --git a/lib/setup.c b/lib/setup.c index 12fb609f..358fd956 100644 --- a/lib/setup.c +++ b/lib/setup.c @@ -258,9 +258,9 @@ int crypt_opal_supported(struct crypt_device *cd, struct device *opal_device) r = opal_supported(cd, opal_device); if (r <= 0) { if (r == -ENOTSUP) - log_err(cd, _("cryptsetup library SED OPAL2 support is disabled.")); + log_err(cd, _("OPAL support is disabled in libcryptsetup.")); else - log_err(cd, _("Device %s or kernel does not support OPAL2 HW encryption."), + log_err(cd, _("Device %s or kernel does not support OPAL encryption."), device_path(opal_device)); r = -EINVAL; } else @@ -2239,7 +2239,7 @@ static int opal_topology_alignment(struct crypt_device *cd, opal_align ? 'y' : 'n', opal_block_bytes, opal_alignment_granularity_blocks, opal_lowest_lba_blocks); if (opal_block_bytes < SECTOR_SIZE || NOTPOW2(opal_block_bytes)) { - log_err(cd, _("Bogus OPAL2 logical block size.")); + log_err(cd, _("Bogus OPAL logical block size.")); return -EINVAL; } diff --git a/src/cryptsetup.c b/src/cryptsetup.c index ec0b638d..88e928d6 100644 --- a/src/cryptsetup.c +++ b/src/cryptsetup.c @@ -3563,10 +3563,10 @@ static void help(poptContext popt_context, path = crypt_token_external_path(); if (path) { - log_std(_("\nLUKS2 external token plugin support is %s.\n"), _("compiled-in")); + log_std(_("\nLUKS2 external token plugin support is enabled.\n")); log_std(_("LUKS2 external token plugin path: %s.\n"), path); } else - log_std(_("\nLUKS2 external token plugin support is %s.\n"), _("disabled")); + log_std(_("\nLUKS2 external token plugin support is disabled.\n")); pbkdf_luks1 = crypt_get_pbkdf_default(CRYPT_LUKS1); pbkdf_luks2 = crypt_get_pbkdf_default(CRYPT_LUKS2); |