[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
48/68: installer: partition: Precise when using Manual/Guided partionmen
From: |
guix-commits |
Subject: |
48/68: installer: partition: Precise when using Manual/Guided partionment. |
Date: |
Thu, 17 Jan 2019 08:05:19 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit ee4004b392c90fc9e25f03c16205615590ea27e6
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
- 37/68: installer: Reorder partitionment step., (continued)
- 37/68: installer: Reorder partitionment step., guix-commits, 2019/01/17
- 39/68: installer: locale: Set English as the default language., guix-commits, 2019/01/17
- 36/68: installer: Fix compute calls., guix-commits, 2019/01/17
- 40/68: installer: Turn "Cancel" buttons into "Exit" buttons., guix-commits, 2019/01/17
- 41/68: installer: keymap: Do not fail on non-kmscon terminals., guix-commits, 2019/01/17
- 54/68: file-systems: Add read-luks-partition-uuid., guix-commits, 2019/01/17
- 60/68: installer: welcome: Put "Graphical installer" ahead., guix-commits, 2019/01/17
- 45/68: installer: Make sure every sentence is dot terminated., guix-commits, 2019/01/17
- 42/68: installer: keymap: Fix keymap selection of layouts with not variant., guix-commits, 2019/01/17
- 46/68: installer: Make exit button optional for run-file-textbox-page., guix-commits, 2019/01/17
- 48/68: installer: partition: Precise when using Manual/Guided partionment.,
guix-commits <=
- 61/68: installer: Remove debug popup., guix-commits, 2019/01/17
- 56/68: installer: Various renamings., guix-commits, 2019/01/17
- 52/68: installer: partionment: Add encryption support., guix-commits, 2019/01/17
- 27/68: installer: Add new pages., guix-commits, 2019/01/17
- 57/68: installer: Various renamins follow-up., guix-commits, 2019/01/17
- 44/68: installer: partition: Differenciate Back button from Exit button., guix-commits, 2019/01/17
- 28/68: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/17
- 58/68: installer: parted: Do not call BLKRRPART on loop devices., guix-commits, 2019/01/17
- 53/68: installer: Clear screen upon exit., guix-commits, 2019/01/17
- 49/68: installer: menu: Fix typo., guix-commits, 2019/01/17