diff options
| author | Daniel Mack <github@zonque.org> | 2015-10-07 15:32:42 +0200 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2015-10-07 15:32:42 +0200 |
| commit | 79bec997c911be7c903db9f7e5d07ab2cd303ed7 (patch) | |
| tree | 1e6e62138a8920a3210b8063157612b484efbea6 /src/firstboot/firstboot.c | |
| parent | f74431288aec78ffdd05be9a519eab3dbe1c4f81 (diff) | |
| parent | e287086b8aa2558356af225a12d9bfea8e7d61ca (diff) | |
Merge pull request #1484 from poettering/ask-pass-kernel-keyring
cache harddisk passwords in the kernel keyring
Diffstat (limited to 'src/firstboot/firstboot.c')
| -rw-r--r-- | src/firstboot/firstboot.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c index 4f0c669ca1..1562ccf0d7 100644 --- a/src/firstboot/firstboot.c +++ b/src/firstboot/firstboot.c @@ -466,7 +466,7 @@ static int prompt_root_password(void) { for (;;) { _cleanup_free_ char *a = NULL, *b = NULL; - r = ask_password_tty(msg1, 0, false, NULL, &a); + r = ask_password_tty(msg1, NULL, 0, 0, NULL, &a); if (r < 0) return log_error_errno(r, "Failed to query root password: %m"); @@ -475,11 +475,10 @@ static int prompt_root_password(void) { break; } - r = ask_password_tty(msg2, 0, false, NULL, &b); + r = ask_password_tty(msg2, NULL, 0, 0, NULL, &b); if (r < 0) { - log_error_errno(r, "Failed to query root password: %m"); clear_string(a); - return r; + return log_error_errno(r, "Failed to query root password: %m"); } if (!streq(a, b)) { |