diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-09-27 19:11:27 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-09-27 19:11:27 +0200 |
| commit | e7f62a41b245ca30404c54f3f77930336627c2f7 (patch) | |
| tree | 4b2a24dcc84f137b92ca581dba96cf7abac70439 /gnu/installer/newt/partition.scm | |
| parent | 1fdab9d3b3e78b0c90b52567be5535a861a7273d (diff) | |
| parent | b48eb1e934f1d457ff6a0fec1c572bb12ed15fab (diff) | |
| download | patches-e7f62a41b245ca30404c54f3f77930336627c2f7.tar patches-e7f62a41b245ca30404c54f3f77930336627c2f7.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/installer/newt/partition.scm')
| -rw-r--r-- | gnu/installer/newt/partition.scm | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 7a9f11a15e..74e9473171 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -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)) |