[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/03: build: file-systems: Add read-luks-partition-uuid.
From: |
guix-commits |
Subject: |
02/03: build: file-systems: Add read-luks-partition-uuid. |
Date: |
Sat, 8 Dec 2018 09:39:08 -0500 (EST) |
mothacehe pushed a commit to branch wip-newt-installer
in repository guix.
commit 488a0a8d6120ead3499ba7742c5d630ddf936476
Author: Mathieu Othacehe <address@hidden>
Date: Sat Dec 8 23:32:23 2018 +0900
build: file-systems: Add read-luks-partition-uuid.
Add a specific procedure to read luks partition uuid.
* gnu/build/file-systems.scm (luks-partition-field-reader): New procedure
...
(luks-partition-uuid-predicate): ... used here,
(read-luks-partition-uuid): new exported procedure.
---
gnu/build/file-systems.scm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/gnu/build/file-systems.scm b/gnu/build/file-systems.scm
index e0ce752..64f9fc6 100644
--- a/gnu/build/file-systems.scm
+++ b/gnu/build/file-systems.scm
@@ -44,6 +44,7 @@
read-partition-label
read-partition-uuid
+ read-luks-partition-uuid
bind-mount
@@ -438,6 +439,12 @@ partition field reader that returned a value."
(define read-partition-uuid
(cut read-partition-field <> %partition-uuid-readers))
+(define luks-partition-field-reader
+ (partition-field-reader read-luks-header luks-header-uuid))
+
+(define read-luks-partition-uuid
+ (cut read-partition-field <> (list luks-partition-field-reader)))
+
(define (partition-predicate reader =)
"Return a predicate that returns true if the FIELD of partition header that
was READ is = to the given value."
@@ -454,9 +461,7 @@ was READ is = to the given value."
(partition-predicate read-partition-uuid uuid=?))
(define luks-partition-uuid-predicate
- (partition-predicate
- (partition-field-reader read-luks-header luks-header-uuid)
- uuid=?))
+ (partition-predicate luks-partition-field-reader uuid=?))
(define (find-partition predicate)
"Return the first partition found that matches PREDICATE, or #f if none