aboutsummaryrefslogtreecommitdiff
path: root/gnu/installer/parted.scm
diff options
context:
space:
mode:
authorMarius Bakke <marius@gnu.org>2020-11-11 00:02:32 +0100
committerMarius Bakke <marius@gnu.org>2020-11-11 00:02:32 +0100
commita9a0d348743af1a25fd27b2b073f0fe2b46978b6 (patch)
treea398c8229d516c99e3e1f4a527939b583ba1f5bb /gnu/installer/parted.scm
parent3dee2299aefaf954ce38073a8dc385ab21b559c2 (diff)
parent569cd538667dd8a0d0eacab2b326777c197260b8 (diff)
downloadguix-a9a0d348743af1a25fd27b2b073f0fe2b46978b6.tar.gz
guix-a9a0d348743af1a25fd27b2b073f0fe2b46978b6.zip
Merge branch 'master' into staging
Diffstat (limited to 'gnu/installer/parted.scm')
-rw-r--r--gnu/installer/parted.scm30
1 files changed, 26 insertions, 4 deletions
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index f2352c5779..f592d315f5 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -758,11 +758,33 @@ cause them to cross."
dev-constraint))
(no-constraint (constraint-any device))
;; Try to create a partition with an optimal alignment
- ;; constraint. If it fails, fallback to creating a partition with
- ;; no specific constraint.
+ ;; constraint. If it fails, fallback to creating a partition
+ ;; with no specific constraint.
+ (partition-constraint-ok?
+ (disk-add-partition disk partition final-constraint))
+ (partition-no-contraint-ok?
+ (or partition-constraint-ok?
+ (disk-add-partition disk partition no-constraint)))
(partition-ok?
- (or (disk-add-partition disk partition final-constraint)
- (disk-add-partition disk partition no-constraint))))
+ (or partition-constraint-ok? partition-no-contraint-ok?)))
+ (syslog "Creating partition:
+~/type: ~a
+~/filesystem-type: ~a
+~/start: ~a
+~/end: ~a
+~/start-range: [~a, ~a]
+~/end-range: [~a, ~a]
+~/constraint: ~a
+~/no-constraint: ~a
+"
+ partition-type
+ (filesystem-type-name filesystem-type)
+ start-sector*
+ end-sector
+ (geometry-start start-range) (geometry-end start-range)
+ (geometry-start end-range) (geometry-end end-range)
+ partition-constraint-ok?
+ partition-no-contraint-ok?)
;; Set the partition name if supported.
(when (and partition-ok? has-name? name)
(partition-set-name partition name))