[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
53/67: file-systems: Add read-luks-partition-uuid.
From: |
guix-commits |
Subject: |
53/67: file-systems: Add read-luks-partition-uuid. |
Date: |
Wed, 16 Jan 2019 19:00:43 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit c87675b7d69f10867eeaaca46cd20a42108a04b1
Author: Mathieu Othacehe <address@hidden>
Date: Sat Dec 8 23:32:23 2018 +0900
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 ee8e814..c468144 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
- 17/67: gnu: guile-newt: Update to revision 4., (continued)
- 17/67: gnu: guile-newt: Update to revision 4., guix-commits, 2019/01/16
- 35/67: installer: Fix compute calls., guix-commits, 2019/01/16
- 36/67: installer: Reorder partitionment step., guix-commits, 2019/01/16
- 24/67: installer: Add services page., guix-commits, 2019/01/16
- 37/67: installer: locale: Make clear that the point is to select a glibc locale., guix-commits, 2019/01/16
- 26/67: installer: Add new pages., guix-commits, 2019/01/16
- 07/67: configure: Disable installer build by default., guix-commits, 2019/01/16
- 30/67: installer: Add user module., guix-commits, 2019/01/16
- 50/67: installer: partition: Fix typo., guix-commits, 2019/01/16
- 49/67: installer: partition: Fix swaping and use syscalls., guix-commits, 2019/01/16
- 53/67: file-systems: Add read-luks-partition-uuid.,
guix-commits <=
- 46/67: installer: Display an eventual backtrace in a page., guix-commits, 2019/01/16
- 22/67: installer: Add configuration formatter., guix-commits, 2019/01/16
- 57/67: installer: parted: Do not call BLKRRPART on loop devices., guix-commits, 2019/01/16
- 08/67: doc: Document the graphical installer., guix-commits, 2019/01/16
- 03/67: gnu: kmscon: Add runtime keymap update support., guix-commits, 2019/01/16
- 27/67: installer: Redirect to TTY3 root shell for unguided install., guix-commits, 2019/01/16
- 13/67: installer: Fix locale installation., guix-commits, 2019/01/16
- 29/67: installer: Fix comments., guix-commits, 2019/01/16
- 25/67: installer: Add hostname., guix-commits, 2019/01/16
- 32/67: installer: Reorder POTFILES.in, guix-commits, 2019/01/16