ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 15:36:20 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

installer: Fix Guile-Parted crash on i686.

Browse source 
Fixes <https://bugs.gnu.org/35783>.
This is a followup to 7d567af46b.

* gnu/installer/parted.scm (auto-partition!): Append ESP-PARTITION, when
it is true, to the result of 'create-adjacent-partitions!'.
* gnu/installer/newt/partition.scm (run-partioning-page): Remove
'initial-partitions' variable, and remove call to
'create-special-user-partitions'.

Co-authored-by: Mathieu Othacehe <m.othacehe@gmail.com>
This commit is contained in:
Ludovic Courtès 2019-05-19 11:58:36 +02:00
parent baab87ac49
commit d68de958b6
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
2 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gnu/installer/newt/partition.scm
View file

@ -751,12 +751,8 @@ (define (run-page devices)
(disk (mklabel device label))) (disk (mklabel device label)))
(disk-commit disk) (disk-commit disk)
disk))) disk)))
(initial-partitions (disk-partitions disk))
(scheme (symbol-append method '- (run-scheme-page))) (scheme (symbol-append method '- (run-scheme-page)))
(user-partitions (append (user-partitions (auto-partition! disk #:scheme scheme)))
(auto-partition! disk #:scheme scheme)
(create-special-user-partitions
initial-partitions))))
(run-disk-page (list disk) user-partitions (run-disk-page (list disk) user-partitions
#:guided? #t))) #:guided? #t)))
((eq? method 'manual) ((eq? method 'manual)

16
gnu/installer/parted.scm
View file

@ -895,7 +895,10 @@ (define* (auto-partition! disk
desired partitioning scheme. It can be 'entire-root or desired partitioning scheme. It can be 'entire-root or
'entire-root-home. 'entire-root will create a swap partition and a root 'entire-root-home. 'entire-root will create a swap partition and a root
partition occupying all the remaining space. 'entire-root-home will create a partition occupying all the remaining space. 'entire-root-home will create a
swap partition, a root partition and a home partition." swap partition, a root partition and a home partition.
Return the complete list of partitions on DISK, including the ESP when it
exists."
(let* ((device (disk-device disk)) (let* ((device (disk-device disk))
(disk-type (disk-disk-type disk)) (disk-type (disk-disk-type disk))
(has-extended? (disk-type-check-feature (has-extended? (disk-type-check-feature
@ -1001,10 +1004,13 @@ (define* (auto-partition! disk
(mount-point "/home"))))))) (mount-point "/home")))))))
(new-partitions* (force-user-partitions-formatting (new-partitions* (force-user-partitions-formatting
new-partitions))) new-partitions)))
(create-adjacent-partitions! disk (append (if esp-partition
new-partitions* (list (partition->user-partition esp-partition))
#:last-partition-end '())
(or end-esp-partition 0))))) (create-adjacent-partitions! disk
new-partitions*
#:last-partition-end
(or end-esp-partition 0))))))
;; ;;