mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
installer: Ensure luks devices are open when mounting partitions.
Partially-Fixes: <https://issues.guix.gnu.org/57983> * gnu/installer/parted.scm (luks-ensure-open): New procedure. (unmount-user-partitions): Ensure luks devices are open. Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
This commit is contained in:
parent
d77612a91b
commit
fd942712d8
1 changed files with 16 additions and 0 deletions
|
@ -1194,6 +1194,20 @@ (define (luks-format-and-open user-partition)
|
|||
((run-command-in-installer) "cryptsetup" "open" "--type" "luks"
|
||||
"--key-file" key-file file-name label)))))
|
||||
|
||||
(define (luks-ensure-open user-partition)
|
||||
"Ensure partition pointed by USER-PARTITION is opened."
|
||||
(unless (file-exists? (user-partition-upper-file-name user-partition))
|
||||
(let* ((file-name (user-partition-file-name user-partition))
|
||||
(label (user-partition-crypt-label user-partition))
|
||||
(password (secret-content (user-partition-crypt-password user-partition))))
|
||||
(call-with-luks-key-file
|
||||
password
|
||||
(lambda (key-file)
|
||||
(installer-log-line "opening LUKS entry ~s at ~s"
|
||||
label file-name)
|
||||
((run-command-in-installer) "cryptsetup" "open" "--type" "luks"
|
||||
"--key-file" key-file file-name label))))))
|
||||
|
||||
(define (luks-close user-partition)
|
||||
"Close the encrypted partition pointed by USER-PARTITION."
|
||||
(let ((label (user-partition-crypt-label user-partition)))
|
||||
|
@ -1278,6 +1292,8 @@ (define (mount-user-partitions user-partitions)
|
|||
(user-fs-type->mount-type fs-type))
|
||||
(file-name
|
||||
(user-partition-upper-file-name user-partition)))
|
||||
(when crypt-label
|
||||
(luks-ensure-open user-partition))
|
||||
(mkdir-p target)
|
||||
(installer-log-line "mounting ~s on ~s" file-name target)
|
||||
(mount file-name target mount-type)))
|
||||
|
|
Loading…
Reference in a new issue