projects
/
platform
/
upstream
/
cryptsetup.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
32c5787
)
Add verbose messages during reencryption to avoid confusion.
author
Milan Broz
<gmazyland@gmail.com>
Fri, 14 Dec 2012 13:48:36 +0000
(14:48 +0100)
committer
Milan Broz
<gmazyland@gmail.com>
Fri, 14 Dec 2012 13:48:36 +0000
(14:48 +0100)
src/cryptsetup_reencrypt.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup_reencrypt.c
b/src/cryptsetup_reencrypt.c
index
16ab100
..
7bc039b
100644
(file)
--- a/
src/cryptsetup_reencrypt.c
+++ b/
src/cryptsetup_reencrypt.c
@@
-400,6
+400,7
@@
static int activate_luks_headers(struct reenc_ctx *rc)
(r = crypt_set_data_device(cd, rc->device)))
goto out;
(r = crypt_set_data_device(cd, rc->device)))
goto out;
+ log_verbose(_("Activating temporary device using old LUKS header.\n"));
if ((r = crypt_activate_by_passphrase(cd, rc->header_file_org,
opt_key_slot, rc->p[rc->keyslot].password, rc->p[rc->keyslot].passwordLen,
CRYPT_ACTIVATE_READONLY|CRYPT_ACTIVATE_PRIVATE)) < 0)
if ((r = crypt_activate_by_passphrase(cd, rc->header_file_org,
opt_key_slot, rc->p[rc->keyslot].password, rc->p[rc->keyslot].passwordLen,
CRYPT_ACTIVATE_READONLY|CRYPT_ACTIVATE_PRIVATE)) < 0)
@@
-410,6
+411,7
@@
static int activate_luks_headers(struct reenc_ctx *rc)
(r = crypt_set_data_device(cd_new, rc->device)))
goto out;
(r = crypt_set_data_device(cd_new, rc->device)))
goto out;
+ log_verbose(_("Activating temporary device using new LUKS header.\n"));
if ((r = crypt_activate_by_passphrase(cd_new, rc->header_file_new,
opt_key_slot, rc->p[rc->keyslot].password, rc->p[rc->keyslot].passwordLen,
CRYPT_ACTIVATE_SHARED|CRYPT_ACTIVATE_PRIVATE)) < 0)
if ((r = crypt_activate_by_passphrase(cd_new, rc->header_file_new,
opt_key_slot, rc->p[rc->keyslot].password, rc->p[rc->keyslot].passwordLen,
CRYPT_ACTIVATE_SHARED|CRYPT_ACTIVATE_PRIVATE)) < 0)