[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
63/68: installer: partition: Add encryption password confirmation.
From: |
guix-commits |
Subject: |
63/68: installer: partition: Add encryption password confirmation. |
Date: |
Thu, 17 Jan 2019 08:05:21 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit f40728f9d65fcff4ca289d5c9642194e60d369d3
Author: Mathieu Othacehe <address@hidden>
Date: Sat Jan 12 18:45:58 2019 +0100
installer: partition: Add encryption password confirmation.
* gnu/installer/newt/partition.scm (prompt-luks-passwords): Add password
confirmation page.
---
gnu/installer/newt/partition.scm | 23 +++++++++++++++++++----
1 file changed, 19 insertions(+), 4 deletions(-)
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index d10e8cd..1c3ce80 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -149,11 +149,26 @@ USER-PARTITIONS list. Return this list with password
fields filled-in."
(run-input-page
(format #f (G_ "Please enter the password for the \
encryption of partition ~a (label: ~a).") file-name crypt-label)
- (G_ "Password required")))))
+ (G_ "Password required"))))
+ (password-confirm-page
+ (lambda ()
+ (run-input-page
+ (format #f (G_ "Please confirm the password for the \
+encryption of partition ~a (label: ~a).") file-name crypt-label)
+ (G_ "Password confirmation required")))))
(if crypt-label
- (user-partition
- (inherit user-part)
- (crypt-password (password-page)))
+ (let loop ()
+ (let ((password (password-page))
+ (confirmation (password-confirm-page)))
+ (if (string=? password confirmation)
+ (user-partition
+ (inherit user-part)
+ (crypt-password password))
+ (begin
+ (run-error-page
+ (G_ "Password mismatch, please try again.")
+ (G_ "Password error"))
+ (loop)))))
user-part)))
user-partitions))
- 16/68: build: syscalls: Add device-in-use?., (continued)
- 16/68: build: syscalls: Add device-in-use?., guix-commits, 2019/01/17
- 18/68: gnu: guile-newt: Update to revision 4., guix-commits, 2019/01/17
- 62/68: installer: keymap: Put English layout and international variant ahead., guix-commits, 2019/01/17
- 12/68: installer: Rewrite welcome page., guix-commits, 2019/01/17
- 64/68: syscalls: 'device-in-use?' does not create a port., guix-commits, 2019/01/17
- 14/68: installer: Fix locale installation., guix-commits, 2019/01/17
- 68/68: installer: Fix manual partitioning., guix-commits, 2019/01/17
- 66/68: installer: Adjust messages on the final page., guix-commits, 2019/01/17
- 65/68: syscalls: 'device-in-use?' returns #f upon EINVAL., guix-commits, 2019/01/17
- 67/68: installer: "formating" → "formatting"., guix-commits, 2019/01/17
- 63/68: installer: partition: Add encryption password confirmation.,
guix-commits <=
- 03/68: services: kmscon: Remove virtual-terminal requirement., guix-commits, 2019/01/17
- 04/68: gnu: kmscon: Add runtime keymap update support., guix-commits, 2019/01/17
- 02/68: guile: newt: Update revision to 3., guix-commits, 2019/01/17
- 01/68: gnu: Add ghc-tldr., guix-commits, 2019/01/17
- 21/68: installer: Remove "selection" from all titles., guix-commits, 2019/01/17
- 20/68: file-systems: Export read-partition-label and read-partition-uuid., guix-commits, 2019/01/17
- 22/68: installer: Add new utils., guix-commits, 2019/01/17
- 33/68: installer: Reorder POTFILES.in, guix-commits, 2019/01/17
- 31/68: installer: Add user module., guix-commits, 2019/01/17
- 32/68: installer: Add partitioning support., guix-commits, 2019/01/17