[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
47/67: installer: partition: Precise when using Manual/Guided partionmen
From: |
guix-commits |
Subject: |
47/67: installer: partition: Precise when using Manual/Guided partionment. |
Date: |
Wed, 16 Jan 2019 19:00:43 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit 0cf3c929e72efd49be8b55c057e76f9090bff22d
Author: Mathieu Othacehe <address@hidden>
Date: Thu Dec 6 11:42:45 2018 +0900
installer: partition: Precise when using Manual/Guided partionment.
* gnu/installer/newt/partition.scm (run-disk-page)[guided?]: New argument.
Use guided? to determine if we are proceeding to a guided or a manuel
partitioning and precise it the title and info-text.
---
gnu/installer/newt/partition.scm | 31 +++++++++++++++++++++----------
1 file changed, 21 insertions(+), 10 deletions(-)
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index a3d48ee..0e1d7b4 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -393,7 +393,8 @@ partition. Leave this field empty if you don't want to set
a mounting point.")
(else result))))
(define* (run-disk-page disks
- #:optional (user-partitions '()))
+ #:optional (user-partitions '())
+ #:key (guided? #f))
"Run a page allowing to edit the partition tables of the given DISKS. If
specified, USER-PARTITIONS is a list of <user-partition> records associated to
the partitions on DISKS."
@@ -597,17 +598,24 @@ edit it."
(else
default-result))))))))
- (let ((result
- (run-listbox-selection-page
-
- #:info-text (G_ "You can change a disk's partition table by \
+ (let* ((info-text (G_ "You can change a disk's partition table by \
selecting it and pressing ENTER. You can also edit a partition by selecting it
\
and pressing ENTER, or remove it by pressing DELETE. To create a new \
partition, select a free space area and press ENTER.
-At least one partition must have its mounting point set to '/'.")
+At least one partition must have its mounting point set to '/'."))
+ (guided-info-text (format (G_ "This is the proposed partitionment. It
\
+is still possible to edit it or to go back to install menu by pressing the \
+Exit button.~%~%")))
+ (result
+ (run-listbox-selection-page
+ #:info-text (if guided?
+ (string-append guided-info-text info-text)
+ info-text)
- #:title (G_ "Manual partitioning")
+ #:title (if guided?
+ (G_ "Guided partitioning")
+ (G_ "Manual partitioning"))
#:info-textbox-width 70
#:listbox-items (disk-items)
#:listbox-item->text cdr
@@ -633,7 +641,8 @@ At least one partition must have its mounting point set to
'/'.")
(begin
(for-each (cut disk-destroy <>) disks)
user-partitions)
- (run-disk-page disks user-partitions)))
+ (run-disk-page disks user-partitions
+ #:guided? guided?)))
(let* ((result-disks (assoc-ref result 'disks))
(result-user-partitions (assoc-ref result
'user-partitions))
@@ -651,7 +660,8 @@ At least one partition must have its mounting point set to
'/'.")
(update-user-partitions result-user-partitions
new-user-partition)
result-user-partitions)))
- (run-disk-page result-disks new-user-partitions)))))
+ (run-disk-page result-disks new-user-partitions
+ #:guided? guided?)))))
(define (run-partioning-page)
"Run a page asking the user for a partitioning method."
@@ -684,7 +694,8 @@ At least one partition must have its mounting point set to
'/'.")
(auto-partition disk #:scheme scheme)
(create-special-user-partitions
(disk-partitions disk)))))
- (run-disk-page (list disk) user-partitions)))
+ (run-disk-page (list disk) user-partitions
+ #:guided? #t)))
((manual)
(let* ((disks (map disk-new devices))
(user-partitions (append-map
- 25/67: installer: Add hostname., (continued)
- 25/67: installer: Add hostname., guix-commits, 2019/01/16
- 32/67: installer: Reorder POTFILES.in, guix-commits, 2019/01/16
- 38/67: installer: locale: Set English as the default language., guix-commits, 2019/01/16
- 34/67: installer: Remove group selection in user page., guix-commits, 2019/01/16
- 40/67: installer: keymap: Do not fail on non-kmscon terminals., guix-commits, 2019/01/16
- 45/67: installer: Make exit button optional for run-file-textbox-page., guix-commits, 2019/01/16
- 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 <=
- 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, 2019/01/16
- 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