From a3ee8f9cb8843502a187400319f2e163ff7e262c Mon Sep 17 00:00:00 2001 From: Milan Broz Date: Thu, 20 Oct 2016 14:10:29 +0200 Subject: [PATCH] Rephrase UUID error message forc cryptsetup-reencrypt. --- man/cryptsetup-reencrypt.8 | 5 +++-- src/cryptsetup_reencrypt.c | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/man/cryptsetup-reencrypt.8 b/man/cryptsetup-reencrypt.8 index 223c8fa3..f2666c80 100644 --- a/man/cryptsetup-reencrypt.8 +++ b/man/cryptsetup-reencrypt.8 @@ -183,8 +183,9 @@ but will minimize data loss in the case of system crash. .TP .B "\-\-uuid" \fI\fR Use only while resuming an interrupted decryption process (see \-\-decrypt). -To find out what \fI\fR to pass look for temporary files LUKS-.[|log|org|new] of the -interrupted decryption process. + +To find out what \fI\fR to pass look for temporary files LUKS-.[|log|org|new] +of the interrupted decryption process. .TP .B "\-\-batch-mode, \-q" Suppresses all warnings and reencryption progress output. diff --git a/src/cryptsetup_reencrypt.c b/src/cryptsetup_reencrypt.c index 198acd7d..842409d1 100644 --- a/src/cryptsetup_reencrypt.c +++ b/src/cryptsetup_reencrypt.c @@ -973,7 +973,7 @@ static int initialize_uuid(struct reenc_ctx *rc) if (!r) rc->device_uuid = strdup(opt_uuid); else - log_err(_("Passed UUID is invalid.\n")); + log_err(_("Provided UUID is invalid.\n")); return r; } @@ -1175,7 +1175,8 @@ static int initialize_context(struct reenc_ctx *rc, const char *device) if (!rc->in_progress) { if (opt_uuid) { - log_err(_("Cannot use passed UUID unless decryption in progress.\n")); + log_err(_("No decryption in progress, provided UUID can " + "be used only to resume suspended decryption process.\n")); return -EINVAL; }