[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#72457] [PATCH 07/15] gnu: system: Fix bootloader crypto device reco
From: |
Tomas Volf |
Subject: |
[bug#72457] [PATCH 07/15] gnu: system: Fix bootloader crypto device recognition. |
Date: |
Sun, 4 Aug 2024 11:22:29 +0200 |
On 2024-08-03 22:55:27 -0500, Lilah Tascheter wrote:
> * 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 | 9 +++++----
> 1 file changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/gnu/system.scm b/gnu/system.scm
> index 66c1a80733..8926e1b065 100644
> --- a/gnu/system.scm
> +++ b/gnu/system.scm
> @@ -400,10 +400,11 @@ (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)))
> + (let* ((luks? (lambda (m) (let ((t (mapped-device-type m)))
> + (or (eq? luks-device-mapping t)
> + (eq? luks-device-mapping-with-options
> t)))))
I think this will not work as expected. luks-device-mapping-with-options is a
procedure to be called, not an object you can eq? against.
Typical use case:
(mapped-device
(source "/dev/sdb1)
(target "data)
(type (luks-device-mapping-with-options
#:key-file "/crypto.key")))
> + (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
>
>
--
There are only two hard things in Computer Science:
cache invalidation, naming things and off-by-one errors.
signature.asc
Description: PGP signature
- [bug#72457] [PATCH 00/15] Rewrite bootloader subsystem., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 05/15] gnu: system: Remove useless boot parameters., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 07/15] gnu: system: Fix bootloader crypto device recognition., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 07/15] gnu: system: Fix bootloader crypto device recognition.,
Tomas Volf <=
- [bug#72457] [PATCH 01/15] guix: scripts: Rewrite reinstall-bootloader to use provenance data., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 03/15] guix: scripts: Remove unused code., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 02/15] gnu: Add bootloader target infastructure., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 04/15] gnu: Core bootloader changes., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 08/15] gnu: packages: Add pesign., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 09/15] gnu: packages: Add ukify., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 10/15] gnu: packages: Add systemd-stub., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 06/15] gnu: bootloader: Add raspberry pi bootloader., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 11/15] gnu: bootloaders: Add uki-efi-bootloader., Lilah Tascheter, 2024/08/03
- [bug#72457] [PATCH 14/15] gnu: tests: Update tests to new targets system., Lilah Tascheter, 2024/08/03