From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id KDdyJNeOsWbPvQAAe85BDQ:P1 (envelope-from ) for ; Tue, 06 Aug 2024 02:47:51 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id KDdyJNeOsWbPvQAAe85BDQ (envelope-from ) for ; Tue, 06 Aug 2024 04:47:51 +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=l4pd6LoZ; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail3 header.b=DrxwI740; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail3 header.b="F/+L+Smt"; 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=1722912471; 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=O3xfLuW2eAoVXqMbSZMgC3Wh9VhuAONZCzEMKWtvXfvxwY4/KQu1RLseIpvgQJ3rEik+Sm 0nUqvojEEFnN1D3kpCBrQmDozbI/GfGI2pKteXkqO4hWXUc9Cvzcen6xceQvCmpQgi9A0K ci/RHqvmB1t+P6DLKqkLtt3GmxM0nCT2ZYWxt5AWsT7msPAVIMHHfpCU+lYLWS1TzcU8KO aZBwseHeiIqZwGtGSz/MF3EOBCiFHGxYbwrYdH992sAbhdx1lld6nAtGoBa7qVbFrCvASK FSBvKXxHeragxwU6MwlvSBYJiFhGYb7IWDhRfH9SLL7IFIwTIGjPa3BkdwEbWw== 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=l4pd6LoZ; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail3 header.b=DrxwI740; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail3 header.b="F/+L+Smt"; 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=1722912471; a=rsa-sha256; cv=none; b=EcjEOu2hcQneGRFrRsTOh89Hx8WTSh/zq4/cWmjZifT8U849wlMoN5IRVQVUeCDGvoFAQ1 s1sjrjHi7B0bcNX9IH/TjKKcXHDrPaVi9sb1sstv+bS1inS8ssGLzH4sfo7yKttUfIFgcg 1IyeY6k6nRGPS0VmH9xFH04h2UkBb0sWfD3BBjjtnAE/UmbEg/LyGFVKmT/U1eM1HdVroP nvNPDkRl+vFacuoL/ptuTOM7J8BJBeZMgeRxnvQLAS9limU9luuZx3z5gs53VRmitbNuJj QIq3QVYnqkfM738eNnacDfVZeYoeJyEWMxOL8CfxHug0cqBUH6wpVLRJUfHvWw== 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 7F97326BEE for ; Tue, 6 Aug 2024 04:47:51 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sbAE5-0000x3-9C; Mon, 05 Aug 2024 22:47:05 -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 1sbADq-0000rt-3c for guix-patches@gnu.org; Mon, 05 Aug 2024 22:46:51 -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 1sbADi-0001Hw-LL for guix-patches@gnu.org; Mon, 05 Aug 2024 22:46:49 -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=l4pd6LoZ/XdtgagxDYvTMreYwEjKL442+/yRBudaZfmxiZjVQSxkDdplfN37wviCSnCx0cqoStyJsI4uRuRi2j+rLTGihefhr15qopFx7aJIqHqE2f42aXPg+0CB5PgCAg+k5V+7WoDzTJGkbDgTgsz9WwREdH2K/FoldyByZ27MaMUuYV18MQ37w/gj3KJJVmPCRI9sMYBvo8oQgWn6X5qMdOL52qMHioZqRU0Xv3/axO2WbSKJa9YnOj2g9mZ/rDq+2GzGDNYjmaLmxQQn+Z3HimNw0uOqcyayoRZyUigIhVGAuGZtjwTomDXZQMwS7/pGoFLQMo1dnQBAH2ejSA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sbAE5-0008Ut-Pr for guix-patches@gnu.org; Mon, 05 Aug 2024 22:47:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v4 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: Tue, 06 Aug 2024 02:47:05 +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.172291239032394 (code B ref 72457); Tue, 06 Aug 2024 02:47:05 +0000 Received: (at 72457) by debbugs.gnu.org; 6 Aug 2024 02:46:30 +0000 Received: from localhost ([127.0.0.1]:59660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbADW-0008QL-8q for submit@debbugs.gnu.org; Mon, 05 Aug 2024 22:46:30 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:51814) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sbADT-0008PG-R7 for 72457@debbugs.gnu.org; Mon, 05 Aug 2024 22:46:28 -0400 DKIM-Signature: a=rsa-sha256; b=DrxwI740VbI6brtOWMVm6LBILSSrsKD/S6qZctHiHtGx2E+PpL0fQMapPBTf252N9NLqDRE9IOKrYH6Tf2YTmknkwjezZTYcMDHWu9igW4q8f+9KRZIQTBaQRZvf/qTMghcLQFjCJSRJt9zkL2F0j8rsDQS6c3ud43SYyCSsnQVU4/FQPgZeyodCY8Ua/Px3lWaegf/JLnLBTT3BmTIOwgtecTjVnTDdUMwXUB95uuxPA6G8de6hQoy4nCAoU8qapgYBf6lh7O5pcPxo4fVzU/QIK/ESbTIRBGea+nf9+jg6LdCTn/XuLO6Hu6EYHGARwZqZerBGkRgwG3LVc8J/CA==; 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=F/+L+Smt+jX0nDdQ1HKsrOLQjOCQ7YRkJoZU8wwOvz+E15sp1tKEol8vyn62yBtxEqBrJqQnkPoXbYySkTA8H/pZj996j6ELQB1rLL74r1e/yV8oir8rioIAeZL2AQ4fNJpcyuwiUb4mK18fnijFQaLHI4SOAVV2QrBaonogCC98+rH/CbDe3jbDb8cVweI2OAKAOJ5DpkoCEunqZrnHngi5ltAGpXpsPZKSeQVa5fVBzPljDEkr5L7i2xVaA+eLDiwWr2BVfUcWAMOYx0knIkUcgSWbOywKbYWikZBhundE2L3iBkVtzZJWQ7sBe2T/sxGttHRE7TjX+ARCFh/N9g==; 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 1040940465; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Tue, 06 Aug 2024 02:45:51 +0000 (UTC) Date: Mon, 5 Aug 2024 21:44:45 -0500 Message-ID: <5c88bcedc201a4d76b7c90e2701f2a6f71d28b6e.1722912293.git.lilah@lunabee.space> 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-Spam-Score: -6.94 X-Migadu-Queue-Id: 7F97326BEE X-Migadu-Scanner: mx10.migadu.com X-Migadu-Spam-Score: -6.94 X-TUID: XBzM6z08jZAz * 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