diff options
author | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-10 17:32:24 +0200 |
---|---|---|
committer | Mathieu Othacehe <m.othacehe@gmail.com> | 2019-10-10 17:32:24 +0200 |
commit | 4d14902b9402a83db444d8d6818d0a4f438ce8c4 (patch) | |
tree | 85f05a0540ebcd4a1f192096c36271a287eb9fe8 /gnu/installer/newt/partition.scm | |
parent | 647cfcf68184e8558fcea751ef6d95b6e5d86ae1 (diff) | |
parent | 6c50e1dc0625f89884cff40b22627091efa37708 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/installer/newt/partition.scm')
-rw-r--r-- | gnu/installer/newt/partition.scm | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index cd9d46316a..74e9473171 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com> +;;; Copyright © 2018, 2019 Mathieu Othacehe <m.othacehe@gmail.com> ;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. @@ -159,14 +159,14 @@ USER-PARTITIONS list. Return this list with password fields filled-in." (format #f (G_ "Please enter the password for the \ encryption of partition ~a (label: ~a).") file-name crypt-label) (G_ "Password required") - #:input-hide-checkbox? #t))) + #:input-visibility-checkbox? #t))) (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") - #:input-hide-checkbox? #t)))) + #:input-visibility-checkbox? #t)))) (if crypt-label (let loop () (let ((password (password-page)) @@ -587,7 +587,6 @@ edit it." disks)) (new-user-partitions (remove-user-partition-by-disk user-partitions item))) - (disk-destroy item) `((disks . ,(cons new-disk other-disks)) (user-partitions . ,new-user-partitions))) `((disks . ,disks) @@ -625,7 +624,7 @@ edit it." info-text))) (case result ((1) - (disk-delete-all item) + (disk-remove-all-partitions item) `((disks . ,disks) (user-partitions . ,(remove-user-partition-by-disk user-partitions item)))) @@ -649,7 +648,7 @@ edit it." (let ((new-user-partitions (remove-user-partition-by-partition user-partitions item))) - (disk-delete-partition disk item) + (disk-remove-partition* disk item) `((disks . ,disks) (user-partitions . ,new-user-partitions)))) (else @@ -696,9 +695,7 @@ by pressing the Exit button.~%~%"))) #f)) (check-user-partitions user-partitions)))) (if user-partitions-ok? - (begin - (for-each (cut disk-destroy <>) disks) - user-partitions) + user-partitions (run-disk-page disks user-partitions #:guided? guided?))) (let* ((result-disks (assoc-ref result 'disks)) |