aboutsummaryrefslogtreecommitdiff
path: root/gnu/installer
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-05-15 00:47:18 +0200
committerLudovic Courtès <ludo@gnu.org>2019-05-15 12:18:51 +0200
commit7d567af46b4e10ffafb1d0f76b524f5781460598 (patch)
tree26aa26c0653c4897796b0d825308c407ef2c9765 /gnu/installer
parent36f5d78d4af02ad23c33bfb46702d92086bf2796 (diff)
downloadguix-7d567af46b4e10ffafb1d0f76b524f5781460598.tar
guix-7d567af46b4e10ffafb1d0f76b524f5781460598.tar.gz
installer: Mount ESP once only.
Fixes <https://bugs.gnu.org/35731>. * gnu/installer/newt/partition.scm (run-partioning-page)[run-page]: Introduce 'initial-partitions' variable. Previously we'd call 'disk-partitions' after 'auto-partition' had done its job of creating new partitions, and thus its result would contain the just-created partitions. Consequently, 'create-special-user-partitions' would return the ESP partition we just created, and thus it would appear twice in the list.
Diffstat (limited to 'gnu/installer')
-rw-r--r--gnu/installer/newt/partition.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index 7f1fb4de15..2960adcf06 100644
--- a/gnu/installer/newt/partition.scm
+++ b/gnu/installer/newt/partition.scm
@@ -751,11 +751,12 @@ by pressing the Exit button.~%~%")))
(disk (mklabel device label)))
(disk-commit disk)
disk)))
+ (initial-partitions (disk-partitions disk))
(scheme (symbol-append method '- (run-scheme-page)))
(user-partitions (append
(auto-partition disk #:scheme scheme)
(create-special-user-partitions
- (disk-partitions disk)))))
+ initial-partitions))))
(run-disk-page (list disk) user-partitions
#:guided? #t)))
((eq? method 'manual)