aboutsummaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2018-12-05 22:00:15 +0900
committerLudovic Courtès <ludo@gnu.org>2019-01-17 14:04:25 +0100
commitcbeb27025f39694b8d12e07ee7e5ce8031690c4e (patch)
tree53dde868f8c0f5aa17052acf0f7206f035b4fbc1 /gnu
parent77c00b1e573776643a4cfb81415be52f436d3ef3 (diff)
downloadguix-cbeb27025f39694b8d12e07ee7e5ce8031690c4e.tar
guix-cbeb27025f39694b8d12e07ee7e5ce8031690c4e.tar.gz
installer: partition: Differenciate Back button from Exit button.
* gnu/installer/newt/partition.scm (run-label-page): Pass the button text as an argument, (run-disk-page): Call run-label-page with the appropriate button text.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/installer/newt/partition.scm7
1 files changed, 4 insertions, 3 deletions
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index 1d5e4538e4..04d6192cd0 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -76,7 +76,7 @@ DEVICES list."
(device (car result)))
device))
-(define (run-label-page button-callback)
+(define (run-label-page button-text button-callback)
"Run a page asking the user to select a partition table label."
(run-listbox-selection-page
#:info-text (G_ "Select a new partition table type. \
@@ -84,7 +84,7 @@ Be careful, all data on the disk will be lost.")
#:title (G_ "Partition table")
#:listbox-items '("msdos" "gpt")
#:listbox-item->text identity
- #:button-text (G_ "Exit")
+ #:button-text button-text
#:button-callback-procedure button-callback))
(define (run-type-page partition)
@@ -519,7 +519,7 @@ edit it."
(let ((item (car listbox-item)))
(cond
((disk? item)
- (let ((label (run-label-page (const #f))))
+ (let ((label (run-label-page (G_ "Back") (const #f))))
(if label
(let* ((device (disk-device item))
(new-disk (mklabel device label))
@@ -674,6 +674,7 @@ At least one partition must have its mounting point set to '/'.")
(disk (if disk-type
(disk-new device)
(let* ((label (run-label-page
+ (G_ "Exit")
button-exit-action))
(disk (mklabel device label)))
(disk-commit disk)