Fails if more device arguments are present for isLuks.

[platform/upstream/cryptsetup.git] / src / cryptsetup_reencrypt.c

diff --git a/src/cryptsetup_reencrypt.c b/src/cryptsetup_reencrypt.c
index faa54b1..5505431 100644 (file)
--- a/src/cryptsetup_reencrypt.c
+++ b/src/cryptsetup_reencrypt.c
@@ -1,12 +1,13 @@
 /*
  * cryptsetup-reencrypt - crypt utility for offline re-encryption
  *
- * Copyright (C) 2012, Milan Broz All rights reserved.
  * Copyright (C) 2012, Red Hat, Inc. All rights reserved.
+ * Copyright (C) 2012-2013, Milan Broz All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -930,7 +931,7 @@ static int initialize_passphrase(struct reenc_ctx *rc, const char *device)
        log_dbg("Passhrases initialization.");
 
        if (opt_new && !rc->in_progress) {
-               r = init_passphrase1(rc, cd, _("Enter new LUKS passphrase: "), 0, 0);
+               r = init_passphrase1(rc, cd, _("Enter new passphrase: "), 0, 0);
                return r > 0 ? 0 : r;
        }
 
@@ -944,14 +945,14 @@ static int initialize_passphrase(struct reenc_ctx *rc, const char *device)
        if (opt_key_file) {
                r = init_keyfile(rc, cd, opt_key_slot);
        } else if (rc->in_progress) {
-               r = init_passphrase1(rc, cd, _("Enter any LUKS passphrase: "),
+               r = init_passphrase1(rc, cd, _("Enter any existing passphrase: "),
                                     CRYPT_ANY_SLOT, 1);
        } else for (i = 0; i < MAX_SLOT; i++) {
                ki = crypt_keyslot_status(cd, i);
                if (ki != CRYPT_SLOT_ACTIVE && ki != CRYPT_SLOT_ACTIVE_LAST)
                        continue;
 
-               snprintf(msg, sizeof(msg), _("Enter LUKS passphrase for key slot %u: "), i);
+               snprintf(msg, sizeof(msg), _("Enter passphrase for key slot %u: "), i);
                r = init_passphrase1(rc, cd, msg, i, 1);
                if (r < 0)
                        break;