chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b853f6e
)
cryptsetup: include device name in password question
author
Lennart Poettering
<lennart@poettering.net>
Tue, 16 Nov 2010 02:24:17 +0000
(
03:24
+0100)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 16 Nov 2010 02:24:17 +0000
(
03:24
+0100)
src/cryptsetup.c
patch
|
blob
|
history
diff --git
a/src/cryptsetup.c
b/src/cryptsetup.c
index c103aa9e03e329735b7e702f3802276d8dbb3e9c..5afac6482f32b212b7adf8f878b8f82217ecaaa7 100644
(file)
--- a/
src/cryptsetup.c
+++ b/
src/cryptsetup.c
@@
-232,8
+232,17
@@
int main(int argc, char *argv[]) {
password = NULL;
if (!key_file) {
password = NULL;
if (!key_file) {
+ char *text;
- if ((k = ask_password_auto("Please enter passphrase for disk:", "drive-harddisk", until, &password)) < 0) {
+ if (asprintf(&text, "Please enter passphrase for disk %s", argv[3]) < 0) {
+ log_error("Out of memory");
+ goto finish;
+ }
+
+ k = ask_password_auto(text, "drive-harddisk", until, &password);
+ free(text);
+
+ if (k < 0) {
log_error("Failed to query password: %s", strerror(-k));
goto finish;
}
log_error("Failed to query password: %s", strerror(-k));
goto finish;
}
@@
-241,7
+250,15
@@
int main(int argc, char *argv[]) {
if (opt_verify) {
char *password2 = NULL;
if (opt_verify) {
char *password2 = NULL;
- if ((k = ask_password_auto("Please enter passphrase for disk (verification):", "drive-harddisk", until, &password2)) < 0) {
+ if (asprintf(&text, "Please enter passphrase for disk %s (verification)", argv[3]) < 0) {
+ log_error("Out of memory");
+ goto finish;
+ }
+
+ k = ask_password_auto(text, "drive-harddisk", until, &password2);
+ free(text);
+
+ if (k < 0) {
log_error("Failed to query verification password: %s", strerror(-k));
goto finish;
}
log_error("Failed to query verification password: %s", strerror(-k));
goto finish;
}