[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
54/67: installer: parted: Use read-luks-partition-uuid instead of find-p
From: |
guix-commits |
Subject: |
54/67: installer: parted: Use read-luks-partition-uuid instead of find-partition-by-luks-uuid. |
Date: |
Wed, 16 Jan 2019 19:00:44 -0500 (EST) |
civodul pushed a commit to branch wip-newt-installer
in repository guix.
commit 1035a473f1bc7806ab09433f8b6a0499d079eb34
Author: Mathieu Othacehe <address@hidden>
Date: Sat Dec 8 23:36:07 2018 +0900
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.
---
gnu/installer/parted.scm | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index c56da60..c7be240 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -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))))
- 52/67: installer: Clear screen upon exit., (continued)
- 52/67: installer: Clear screen upon exit., guix-commits, 2019/01/16
- 44/67: installer: Make sure every sentence is dot terminated., guix-commits, 2019/01/16
- 47/67: installer: partition: Precise when using Manual/Guided partionment., guix-commits, 2019/01/16
- 65/67: installer: Adjust messages on the final page., guix-commits, 2019/01/16
- 66/67: installer: "formating" → "formatting"., guix-commits, 2019/01/16
- 12/67: installer: Move everything to the build side., guix-commits, 2019/01/16
- 39/67: installer: Turn "Cancel" buttons into "Exit" buttons., guix-commits, 2019/01/16
- 23/67: installer: Do not ask for keyboard model., guix-commits, 2019/01/16
- 62/67: installer: partition: Add encryption password confirmation., guix-commits, 2019/01/16
- 60/67: installer: Remove debug popup., guix-commits, 2019/01/16
- 54/67: installer: parted: Use read-luks-partition-uuid instead of find-partition-by-luks-uuid.,
guix-commits <=
- 59/67: installer: welcome: Put "Graphical installer" ahead., guix-commits, 2019/01/16
- 55/67: installer: Various renamings., guix-commits, 2019/01/16
- 64/67: syscalls: 'device-in-use?' returns #f upon EINVAL., guix-commits, 2019/01/16
- 42/67: installer: network: Do not show an empty technology list., guix-commits, 2019/01/16
- 41/67: installer: keymap: Fix keymap selection of layouts with not variant., guix-commits, 2019/01/16
- 58/67: installer: Rename "Ok" buttons to "OK"., guix-commits, 2019/01/16
- 67/67: installer: Fix manual partitioning., guix-commits, 2019/01/16
- 61/67: installer: keymap: Put English layout and international variant ahead., guix-commits, 2019/01/16
- 56/67: installer: Various renamins follow-up., guix-commits, 2019/01/16
- 63/67: syscalls: 'device-in-use?' does not create a port., guix-commits, 2019/01/16