From 8ae7044f1d6a8c6a8a91ae6c032030e1affc9772 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Sat, 8 Dec 2018 23:32:23 +0900 Subject: [PATCH] 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 ee8e8146b2..c468144170 100644 --- a/gnu/build/file-systems.scm +++ b/gnu/build/file-systems.scm @@ -44,6 +44,7 @@ (define-module (gnu build file-systems) read-partition-label read-partition-uuid + read-luks-partition-uuid bind-mount @@ -438,6 +439,12 @@ (define read-partition-label (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 @@ (define partition-uuid-predicate (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