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

21
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,8 +820,8 @@ cause them to cross."
;; Auto partitionning.
;;
(define* (create-adjacent-partitions disk partitions
#:key (last-partition-end 0))
(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
partition are computed from its SIZE value and the position of the last
@ -888,9 +887,9 @@ USER-PARTITIONS list and return the updated list."
(need-formatting? #t)))
user-partitions))
(define* (auto-partition disk
#:key
(scheme 'entire-root))
(define* (auto-partition! disk
#:key
(scheme 'entire-root))
"Automatically create partitions on DISK. All the previous
partitions (except the ESP on a GPT disk, if present) are wiped. SCHEME is the
desired partitioning scheme. It can be 'entire-root or
@ -1002,10 +1001,10 @@ swap partition, a root partition and a home partition."
(mount-point "/home")))))))
(new-partitions* (force-user-partitions-formatting
new-partitions)))
(create-adjacent-partitions disk
new-partitions*
#:last-partition-end
(or end-esp-partition 0)))))
(create-adjacent-partitions! disk
new-partitions*
#:last-partition-end
(or end-esp-partition 0)))))
;;