From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id oDeNGGq8smbDXAEA62LTzQ:P1 (envelope-from ) for ; Wed, 07 Aug 2024 00:14:34 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id oDeNGGq8smbDXAEA62LTzQ (envelope-from ) for ; Wed, 07 Aug 2024 02:14:34 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=vBBJ44dL; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail3 header.b=hDZABLN7; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail3 header.b=WwKKqHec; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722989674; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ITnbJATRgjwSOQGaxxp2/7KQsZ6tBcJpbkX3rwTv/eU=; b=iFDCGYkX3tIIgPl3M83vMh1akqVGIe4CcLm3yjHDy0fgNt/t3ab+BtAuhg4OW3uvAZs33r ZnFRV6vSmtfm9vSwfpW62SADNl3kJeP8H5Ovx6zmiFaDlLo7/dj58zr2OVO3KAI2724ZzP tEVxcRm0FHtq+swVyf/5qxdbmWNKzhFWd9idkROdxKbgsS9fRkiRfCrJ3jQclMD/vLd/Pj +EIjw6f7ROAyX78cu7SuD+hiJEDEUDjnsE4x9M7Eir2RIoD16dBXH9hhMPNqfNiXM8ktWn R0BiJNzbwh8JbOO64SIz2JGjRmYKqooXuqUfZkCINNH7BWzoPtisEgCpqkA4qQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=vBBJ44dL; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail3 header.b=hDZABLN7; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail3 header.b=WwKKqHec; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722989674; a=rsa-sha256; cv=none; b=LSibyu2g4W7jLnspTvrlUC7EaLl5oMQhJxRsgCPofJWFhY53aSdlqoGiOBl8frMLbupg27 9O/oyJXcJsCKAjjV3+V/Y7wd9iDbmrinr5vhXDVnElzkVemoy6MNODIgcLhuIqcvvOqMFm EisaIQN4/rS7IqIIu1YomRrNnIYa9M+avRYpn+5nnwwpolWAHbD6ysfzp5kXK5tQ4ItdW1 IIWcuD7aPPDHrZuHg/PdFYnbZoixJIhcp/qtL5316q6AQD5/LxfGmT9dN+5r178oPyKi4V qSapHZPA0xaE7Fmh5sxy2gt2LYaZ5dOU8hpbAFeXNToGFhTbWVFj3TBH7dPgkw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 507225616B for ; Wed, 7 Aug 2024 02:14:34 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbUJL-0004n5-G6; Tue, 06 Aug 2024 20:13:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sbUJD-0004Fu-LQ for guix-patches@gnu.org; Tue, 06 Aug 2024 20:13:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sbUJC-00025H-2m for guix-patches@gnu.org; Tue, 06 Aug 2024 20:13:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=ITnbJATRgjwSOQGaxxp2/7KQsZ6tBcJpbkX3rwTv/eU=; b=vBBJ44dLs7M9ceAgcyiMZ8w8Q6jhdIiYXkBYr7CSTxgXtaElfyScNJzogkTnO9WIJQQ5zxPmWQamp2kIHuPnz4Y7Cmpm06qYzC5j9pFdvFubBTeTsk4OrPD+9g4pKf0hFBYKwS7nhrtE4UT6pG4+QL7Utn8YINoLCP75TZGWJFwe8UhFNQsbNgho6MbWsmVYRu0pwzNQoyhJWNB+twjKdz8kyDPAYKWs2VwWdfAKIq1qS4yrRIv6pbjq636X4MjtnBQLXqLEUu0x4BZu1L/KuTxVOIhYBPEmO9A10HwtwvH3/CKR4b9eKcZkER0NFl1vY8euprDG/Nqh0w5o20e8tw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sbUJa-0006yG-Ei for guix-patches@gnu.org; Tue, 06 Aug 2024 20:14:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v5 07/15] gnu: system: Fix bootloader crypto device recognition. Resent-From: Lilah Tascheter Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Aug 2024 00:14:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72457 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72457@debbugs.gnu.org Cc: Lilah Tascheter , Sergey Trofimov Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172298963726682 (code B ref 72457); Wed, 07 Aug 2024 00:14:06 +0000 Received: (at 72457) by debbugs.gnu.org; 7 Aug 2024 00:13:57 +0000 Received: from localhost ([127.0.0.1]:33248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbUJR-0006wI-FU for submit@debbugs.gnu.org; Tue, 06 Aug 2024 20:13:57 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:55774) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbUJQ-0006vX-7o for 72457@debbugs.gnu.org; Tue, 06 Aug 2024 20:13:56 -0400 DKIM-Signature: a=rsa-sha256; b=hDZABLN7W/fHWLTiwkqwCthP0umBK98Q7tQhaQu2X5CuJaNNs7CyyOpruWHJZ6TKJLvuoSFi8/yUIOIW/6ymQS1ffKz/f2D7rnhSuaqg6eNXOHmD5mjFVZIsd/+UqscMgkaFMBIVA8g7QLKhcH23B3DDI3+WHRsdh5gQk9/ZpoO9gzNl/ao5Eg4bKUdlRYxlgYTMmnR9jIgkQ53HLP7xWQPdukp0oGWsrqdgrzbnjTrP0lWvwk+knsQhBm6WnBWJ4+1HbtpUrDxkla3RIAaKVCpIkl0xFYmXrD8PUUJBoN2fqsB0pI408RuHuiPlO5tSrgeKIOmpqC0WD4Qbxvx1nw==; s=purelymail3; d=lunabee.space; v=1; bh=1+K1cMVp+fD6IiJ/hWeAOXQkdR+3XoaOTauQoU1utuI=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=WwKKqHec5ywIQPSBAfc2NegGpqObt72LWqlQD52HCxAWkyr10GRTdZdZ9KvOiunYl3NuNN5yD8dn3othzzg6JQ8B4k4Gzqwn8Ftj2dOuObArMuQ5Y8o5BaJSoF7wInz2h1wwD3ZwzOuYvbvUXNg4+B1xL5JEBypjmjTsnsiL93ZO8Q5Spg/oxFD0jb/5d029jBui6E/Ekr7oQqxlIEsMoCwgAA4Ei1wlS77J2YeXbPsWbn8Tc5gbljoq+tKBBV08sjpuSN2McKq2HHQhLu3DqLAgJps3Aw92HcNBCgEgtNLHOKPQbJZtD1URkmweMzzW82hML2zjmSeKIefhJdQDDg==; s=purelymail3; d=purelymail.com; v=1; bh=1+K1cMVp+fD6IiJ/hWeAOXQkdR+3XoaOTauQoU1utuI=; h=Feedback-ID:Received:From:To:Subject:Date; Feedback-ID: 8937:2070:null:purelymail X-Pm-Original-To: 72457@debbugs.gnu.org Received: by smtp.purelymail.com (Purelymail SMTP) with ESMTPSA id -1661201426; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Wed, 07 Aug 2024 00:13:13 +0000 (UTC) Date: Tue, 6 Aug 2024 19:11:20 -0500 Message-ID: In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail Content-Type: text/plain; charset=UTF-8 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: Lilah Tascheter via Guix-patches Reply-To: Lilah Tascheter Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 507225616B X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.94 X-Spam-Score: -6.94 X-TUID: Uz4T61ZsFMEt * 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-so= urce) luks-devices))) --=20 2.45.2