[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
62/67: installer: partition: Add encryption password confirmation.
From: |
guix-commits |
Subject: |
62/67: installer: partition: Add encryption password confirmation. |
Date: |
Wed, 16 Jan 2019 19:00:45 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit 1f040d789b04a59a5eb04012b6a92200948ba0a1
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))
- 43/67: installer: partition: Differenciate Back button from Exit button., (continued)
- 43/67: installer: partition: Differenciate Back button from Exit button., guix-commits, 2019/01/16
- 48/67: installer: menu: Fix typo., guix-commits, 2019/01/16
- 52/67: installer: Clear screen upon exit., guix-commits, 2019/01/16
- 44/67: installer: Make sure every sentence is dot terminated., guix-commits, 2019/01/16
- 47/67: installer: partition: Precise when using Manual/Guided partionment., guix-commits, 2019/01/16
- 65/67: installer: Adjust messages on the final page., guix-commits, 2019/01/16
- 66/67: installer: "formating" → "formatting"., guix-commits, 2019/01/16
- 12/67: installer: Move everything to the build side., guix-commits, 2019/01/16
- 39/67: installer: Turn "Cancel" buttons into "Exit" buttons., guix-commits, 2019/01/16
- 23/67: installer: Do not ask for keyboard model., guix-commits, 2019/01/16
- 62/67: installer: partition: Add encryption password confirmation.,
guix-commits <=
- 60/67: installer: Remove debug popup., guix-commits, 2019/01/16
- 54/67: installer: parted: Use read-luks-partition-uuid instead of find-partition-by-luks-uuid., guix-commits, 2019/01/16
- 59/67: installer: welcome: Put "Graphical installer" ahead., guix-commits, 2019/01/16
- 55/67: installer: Various renamings., guix-commits, 2019/01/16
- 64/67: syscalls: 'device-in-use?' returns #f upon EINVAL., guix-commits, 2019/01/16
- 42/67: installer: network: Do not show an empty technology list., guix-commits, 2019/01/16
- 41/67: installer: keymap: Fix keymap selection of layouts with not variant., guix-commits, 2019/01/16
- 58/67: installer: Rename "Ok" buttons to "OK"., guix-commits, 2019/01/16
- 67/67: installer: Fix manual partitioning., guix-commits, 2019/01/16
- 61/67: installer: keymap: Put English layout and international variant ahead., guix-commits, 2019/01/16