diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-05-15 14:33:23 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-05-15 16:36:20 +0200 |
| commit | 15374648193f813d036f377bb1e944c9bafd4636 (patch) | |
| tree | b43f69071a11fdc5cfc1ef4bef80710bfc10709b | |
| parent | 79bfa42287f98e72b99e7165280e2750fad46cd3 (diff) | |
| download | gnu-guix-15374648193f813d036f377bb1e944c9bafd4636.tar gnu-guix-15374648193f813d036f377bb1e944c9bafd4636.tar.gz | |
installer: Rename 'auto-partition' to 'auto-partition!'.
This is a followup to 7d567af46b4e10ffafb1d0f76b524f5781460598.
* 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.
| -rw-r--r-- | gnu/installer/newt/partition.scm | 2 | ||||
| -rw-r--r-- | gnu/installer/parted.scm | 21 |
2 files changed, 11 insertions, 12 deletions
diff --git a/gnu/installer/newt/partition.scm b/gnu/installer/newt/partition.scm index 2960adcf06..abc8bdcc03 100644 --- a/gnu/installer/newt/partition.scm +++ b/gnu/installer/newt/partition.scm @@ -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 diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index 6975ecd519..4ccc0b1f51 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -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))))) ;; |