nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

installer: Rename 'auto-partition' to 'auto-partition!'. 

This is a followup to 7d567af46b.

* gnu/installer/parted.scm (create-adjacent-partitions): Rename to...
(create-adjacent-partitions!): ... this.  Make private.
(auto-partition): Rename to...
(auto-partition!): ... this.
* gnu/installer/newt/partition.scm (run-partioning-page): Adjust
accordingly.
This commit is contained in:
Ludovic Courtès 2019-05-15 14:33:23 +02:00
parent 79bfa42287
commit 1537464819
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gnu/installer/newt/partition.scm
View File

@ -754,7 +754,7 @@ by pressing the Exit button.~%~%")))
(initial-partitions (disk-partitions disk))
(scheme (symbol-append method '- (run-scheme-page)))
(user-partitions (append
(auto-partition disk #:scheme scheme)
(auto-partition! disk #:scheme scheme)
(create-special-user-partitions
initial-partitions))))
(run-disk-page (list disk) user-partitions

9
gnu/installer/parted.scm
View File

@ -105,8 +105,7 @@
mkpart
rmpart
create-adjacent-partitions
auto-partition
auto-partition!
&no-root-mount-point
no-root-mount-point?
@ -821,7 +820,7 @@ cause them to cross."
;; Auto partitionning.
;;
(define* (create-adjacent-partitions disk partitions
(define* (create-adjacent-partitions! disk partitions
#:key (last-partition-end 0))
"Create the given PARTITIONS on DISK. LAST-PARTITION-END is the sector from
which we want to start creating partitions. The START and END of each created
@ -888,7 +887,7 @@ USER-PARTITIONS list and return the updated list."
(need-formatting? #t)))
user-partitions))
(define* (auto-partition disk
(define* (auto-partition! disk
#:key
(scheme 'entire-root))
"Automatically create partitions on DISK. All the previous
@ -1002,7 +1001,7 @@ swap partition, a root partition and a home partition."
(mount-point "/home")))))))
(new-partitions* (force-user-partitions-formatting
new-partitions)))
(create-adjacent-partitions disk
(create-adjacent-partitions! disk
new-partitions*
#:last-partition-end
(or end-esp-partition 0)))))