nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

installer: parted: Use read-luks-partition-uuid instead of 

find-partition-by-luks-uuid.

* gnu/installer/parted.scm (user-partition->mapped-device): Replace
read-luks-partition-uuid by find-partition-by-luks-uuid,
(user-partition->file-system): only compute uuid if the partition
is not encrypted.
master
Mathieu Othacehe 2018-12-08 23:36:07 +09:00 committed by Ludovic Courtès
parent 8ae7044f1d
commit 59e8f3c3ac
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gnu/installer/parted.scm
View File

@ -23,7 +23,7 @@
#:use-module (gnu system uuid)
#:use-module ((gnu build file-systems)
#:select (read-partition-uuid
find-partition-by-luks-uuid))
read-luks-partition-uuid))
#:use-module (guix build syscalls)
#:use-module (guix build utils)
#:use-module (guix records)
@ -1203,8 +1203,9 @@ the FS-TYPE field set to 'swap, return the empty list if none found."
(mount-type (user-fs-type->mount-type fs-type))
(path (user-partition-path user-partition))
(upper-path (user-partition-upper-path user-partition))
(uuid (uuid->string (read-partition-uuid path)
fs-type)))
;; Only compute uuid if partition is not encrypted.
(uuid (or crypt-label
(uuid->string (read-partition-uuid path) fs-type))))
`(file-system
(mount-point ,mount-point)
(device ,@(if crypt-label
@ -1232,7 +1233,9 @@ from (gnu system mapped-devices) and return it."
(let ((label (user-partition-crypt-label user-partition))
(path (user-partition-path user-partition)))
`(mapped-device
(source (uuid ,(uuid->string (read-partition-uuid path))))
(source (uuid ,(uuid->string
(read-luks-partition-uuid path)
'luks)))
(target ,label)
(type luks-device-mapping))))