[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/05: installer: Mount ESP once only.
From: |
guix-commits |
Subject: |
02/05: installer: Mount ESP once only. |
Date: |
Wed, 15 May 2019 06:19:04 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 7d567af46b4e10ffafb1d0f76b524f5781460598
Author: Ludovic Courtès <address@hidden>
Date: Wed May 15 00:47:18 2019 +0200
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.
---
gnu/installer/newt/partition.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm
index 7f1fb4d..2960adc 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)