[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#72457] [PATCH v3 07/15] gnu: system: Fix bootloader crypto device r
From: |
Lilah Tascheter |
Subject: |
[bug#72457] [PATCH v3 07/15] gnu: system: Fix bootloader crypto device recognition. |
Date: |
Sun, 4 Aug 2024 15:31:53 -0500 |
* gnu/system.scm (operating-system-bootloader-crypto-devices): Check for
luks-device-mapping-with-options in addition to luks-device-mapping.
Change-Id: Iafc9afe608640b97083c4d559c9240846330472a
---
gnu/system.scm | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/gnu/system.scm b/gnu/system.scm
index 66c1a80733..093c8fa350 100644
--- a/gnu/system.scm
+++ b/gnu/system.scm
@@ -400,10 +400,12 @@ (define operating-system-bootloader-crypto-devices
(mlambdaq (os) ;to avoid duplicated output
"Return the sources of the LUKS mapped devices specified by UUID."
;; XXX: Device ordering is important, we trust the returned one.
- (let* ((luks-devices (filter (lambda (m)
- (eq? luks-device-mapping
- (mapped-device-type m)))
- (operating-system-boot-mapped-devices os)))
+ ;; Check against the close-luks-device procedure to get both maptypes
+ (let* ((close (mapped-device-kind-close luks-device-mapping))
+ (luks? (lambda (m) (let ((t (mapped-device-type m)))
+ (eq? (mapped-device-kind-close t) close))))
+ (luks-devices (filter luks?
+ (operating-system-boot-mapped-devices os)))
(uuid-crypto-devices non-uuid-crypto-devices
(partition (compose uuid? mapped-device-source)
luks-devices)))
--
2.45.2
- [bug#72457] [PATCH v2 08/15] gnu: packages: Add pesign., (continued)
- [bug#72457] [PATCH v2 08/15] gnu: packages: Add pesign., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v2 15/15] teams: Add bootloading team., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v2 10/15] gnu: packages: Add systemd-stub., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v2 11/15] gnu: bootloaders: Add uki-efi-bootloader., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v2 14/15] gnu: tests: Update tests to new targets system., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v2 13/15] doc: Update bootloader documentation., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v2 09/15] gnu: packages: Add ukify., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v2 00/15] Rewrite bootloader subsystem., Sergey Trofimov, 2024/08/04
- [bug#72457] [PATCH v3 00/15] Rewrite bootloader subsystem., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 05/15] gnu: system: Remove useless boot parameters., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 07/15] gnu: system: Fix bootloader crypto device recognition.,
Lilah Tascheter <=
- [bug#72457] [PATCH v3 08/15] gnu: packages: Add pesign., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 03/15] guix: scripts: Remove unused code., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 02/15] gnu: Add bootloader target infastructure., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 09/15] gnu: packages: Add ukify., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 01/15] guix: scripts: Rewrite reinstall-bootloader to use provenance data., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 10/15] gnu: packages: Add systemd-stub., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 11/15] gnu: bootloaders: Add uki-efi-bootloader., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 14/15] gnu: tests: Update tests to new targets system., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 06/15] gnu: bootloader: Add raspberry pi bootloader., Lilah Tascheter, 2024/08/04
- [bug#72457] [PATCH v3 15/15] teams: Add bootloading team., Lilah Tascheter, 2024/08/04