From f40728f9d65fcff4ca289d5c9642194e60d369d3 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Sat, 12 Jan 2019 18:45:58 +0100
Subject: 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(-)

(limited to 'gnu/installer')

diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index d10e8cd2b7..1c3ce80ce5 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))
 
-- 
cgit v1.2.3

s='path'>path: <a href='/guix/log/?id=7bed290fdfd830d690daf065de6d2ecab73309d9'>root</a>/<a href='/guix/log/gnu?id=7bed290fdfd830d690daf065de6d2ecab73309d9'>gnu</a>/<a href='/guix/log/gnu/packages?id=7bed290fdfd830d690daf065de6d2ecab73309d9'>packages</a>/<a href='/guix/log/gnu/packages/apr.scm?id=7bed290fdfd830d690daf065de6d2ecab73309d9'>apr.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/packages/apr.scm?id=7bed290fdfd830d690daf065de6d2ecab73309d9&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2023-08-02 20:23:01 +0300'>2023-08-02</span></td><td><a href='/guix/commit/gnu/packages/apr.scm?id=23e2ff223c0511317edf236504fb474e3b5ac301'>gnu: apr: Fix building on powerpc-linux.</a><span class='msg-avail'>...</span></td><td>Efraim Flashner</td></tr>