diff options
| author | Miguel Ángel Arruga Vivas <rosen644835@gmail.com> | 2020-10-31 12:15:35 +0100 |
|---|---|---|
| committer | Miguel Ángel Arruga Vivas <rosen644835@gmail.com> | 2020-11-02 03:42:08 +0100 |
| commit | bc9e66f0feb25c77898222cfe5f3ef484dcee95e (patch) | |
| tree | 66ab2db829dada3d6aa3be5eb2d566862a84bdd5 | |
| parent | 8f71305e8f87bf15d158fb2726c4a46cdf36eaf5 (diff) | |
| download | guix-bc9e66f0feb25c77898222cfe5f3ef484dcee95e.tar guix-bc9e66f0feb25c77898222cfe5f3ef484dcee95e.tar.gz | |
installer: Report to the user the formatted partitions.
* gnu/installer/newt/partitions.scm (define-module): Use (ice-9 format).
(draw-formatting-page): Add parameter partitions and provide the list of
formatted partitions to the user.
(run-partitioning-page): Provide user-partitions to draw-formatting-page.
| -rw-r--r-- | gnu/installer/newt/partition.scm | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 3b891d693a..35f76db3ed 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -25,6 +25,7 @@ #:use-module (gnu installer newt page) #:use-module (gnu installer newt utils) #:use-module (guix i18n) + #:use-module (ice-9 format) #:use-module (ice-9 match) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) @@ -56,11 +57,17 @@ #:button-callback-procedure button-exit-action))) (car result))) -(define (draw-formatting-page) +(define (draw-formatting-page partitions) "Draw a page asking for confirmation, and then indicating that partitions are being formatted." - (run-confirmation-page (G_ "We are about to format your hard disk. All \ -its data will be lost. Do you wish to continue?") + ;; TRANSLATORS: The ~{ and ~} format specifiers are used to iterate the list + ;; of device names of the user partitions that will be formatted. + (run-confirmation-page (format #f (G_ "We are about to write the configured \ +partition table to the disk and format the partitions listed below. Their \ +data will be lost. Do you wish to continue?~%~{ - ~a~%~}") + (map user-partition-file-name + (filter user-partition-need-formatting? + partitions))) (G_ "Format disk?") #:exit-button-procedure button-exit-action) (draw-info-page @@ -773,7 +780,7 @@ by pressing the Exit button.~%~%"))) (user-partitions (run-page non-install-devices)) (user-partitions-with-pass (prompt-luks-passwords user-partitions)) - (form (draw-formatting-page))) + (form (draw-formatting-page user-partitions))) ;; Make sure the disks are not in use before proceeding to formatting. (free-parted non-install-devices) (format-user-partitions user-partitions-with-pass) |