GNU bug report logs - #72457
[PATCH 00/15] Rewrite bootloader subsystem.

Previous Next

Package: guix-patches;

Reported by: Lilah Tascheter <lilah <at> lunabee.space>

Date: Sun, 4 Aug 2024 03:52:01 UTC

Severity: normal

Tags: patch

Fix blocked by 73202: [PATCH] Preparation for bootloader rewrite.

Full log

View this message in rfc822 format

From: Lilah Tascheter <lilah <at> lunabee.space>
To: 72457 <at> debbugs.gnu.org
Cc: Lilah Tascheter <lilah <at> lunabee.space>, Sergey Trofimov <sarg <at> sarg.org.ru>
Subject: [bug#72457] [PATCH v4 07/15] gnu: system: Fix bootloader crypto device recognition.
Date: Mon,  5 Aug 2024 21:44:45 -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
This bug report was last modified 237 days ago.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.