me
/
guix
Archived
1
0
Fork 0
Code

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>
master
Josselin Poiret 2022-09-22 15:12:46 +02:00 committed by Mathieu Othacehe
parent d77612a91b
commit fd942712d8
No known key found for this signature in database
GPG Key ID: 8354763531769CA6
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gnu/installer/parted.scm
View File

@ -1194,6 +1194,20 @@ USER-PARTITION if it is encrypted, or the plain file-name otherwise."
((run-command-in-installer) "cryptsetup" "open" "--type" "luks" ((run-command-in-installer) "cryptsetup" "open" "--type" "luks"
"--key-file" key-file file-name label))))) "--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) (define (luks-close user-partition)
"Close the encrypted partition pointed by USER-PARTITION." "Close the encrypted partition pointed by USER-PARTITION."
(let ((label (user-partition-crypt-label user-partition))) (let ((label (user-partition-crypt-label user-partition)))
@ -1278,6 +1292,8 @@ respective mount-points."
(user-fs-type->mount-type fs-type)) (user-fs-type->mount-type fs-type))
(file-name (file-name
(user-partition-upper-file-name user-partition))) (user-partition-upper-file-name user-partition)))
(when crypt-label
(luks-ensure-open user-partition))
(mkdir-p target) (mkdir-p target)
(installer-log-line "mounting ~s on ~s" file-name target) (installer-log-line "mounting ~s on ~s" file-name target)
(mount file-name target mount-type))) (mount file-name target mount-type)))