[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/08: installer: Rename 'auto-partition' to 'auto-partition!'.
From: |
guix-commits |
Subject: |
01/08: installer: Rename 'auto-partition' to 'auto-partition!'. |
Date: |
Wed, 15 May 2019 10:36:30 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 15374648193f813d036f377bb1e944c9bafd4636
Author: Ludovic Courtès <address@hidden>
Date: Wed May 15 14:33:23 2019 +0200
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.
---
gnu/installer/newt/partition.scm | 2 +-
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 2960adc..abc8bdc 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 6975ecd..4ccc0b1 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)))))
;;
- branch master updated (79bfa42 -> 247649d), guix-commits, 2019/05/15
- 01/08: installer: Rename 'auto-partition' to 'auto-partition!'.,
guix-commits <=
- 02/08: doc: Mention ModemManager., guix-commits, 2019/05/15
- 04/08: linux-container: Do not add %CONTAINER-FILE-SYSTEMS to Docker image OSes., guix-commits, 2019/05/15
- 05/08: linux-container: Compute essential services for THIS-OPERATING-SYSTEM., guix-commits, 2019/05/15
- 08/08: vm: 'system-docker-image' provides an entry point., guix-commits, 2019/05/15
- 06/08: system: Add 'operating-system-with-gc-roots'., guix-commits, 2019/05/15
- 07/08: docker: 'build-docker-image' accepts an optional #:entry-point., guix-commits, 2019/05/15
- 03/08: nls: Update 'zh_CN' translation., guix-commits, 2019/05/16