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
(parent:
b773823
)
If in progress, just use normal path (check passphrase).
author
Milan Broz
<gmazyland@gmail.com>
Mon, 18 Jun 2012 12:52:35 +0000
(14:52 +0200)
committer
Milan Broz
<gmazyland@gmail.com>
Mon, 18 Jun 2012 12:52:35 +0000
(14:52 +0200)
src/cryptsetup_reencrypt.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup_reencrypt.c
b/src/cryptsetup_reencrypt.c
index
03d6d21
..
f5f33da
100644
(file)
--- a/
src/cryptsetup_reencrypt.c
+++ b/
src/cryptsetup_reencrypt.c
@@
-1014,7
+1014,7
@@
static int initialize_passphrase(struct reenc_ctx *rc, const char *device)
log_dbg("Passhrases initialization.");
- if (opt_new) {
+ if (opt_new
&& !rc->in_progress
) {
r = init_passphrase1(rc, cd, _("Enter new LUKS passphrase: "), 0, 0);
return r > 0 ? 0 : r;
}