From patchwork Sun Aug 4 18:06:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lilah Tascheter X-Patchwork-Id: 66684 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7D39427BBEA; Sun, 4 Aug 2024 19:18:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FROM_SUSPICIOUS_NTLD,MAILING_LIST_MULTI,PDS_OTHER_BAD_TLD, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E8D8727BBE2 for ; Sun, 4 Aug 2024 19:18:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1safng-00027E-Vk; Sun, 04 Aug 2024 14:17:52 -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 1safnd-00026V-24 for guix-patches@gnu.org; Sun, 04 Aug 2024 14:17:45 -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 1safnc-0001qo-G4 for guix-patches@gnu.org; Sun, 04 Aug 2024 14:17:44 -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=JY+JjBOmPf7bKq3j1N6WBUy39nsK/+kbWS4rUipup3uCd1fy8KqTeYcH+qVPiigAsfm3gYY/FnIKqCpeP5HBXNXlBIUKTYuWKIkiyu4pOOzp9H9a8t10XxaCCNuh0Y3FWRsNvrO99TUzZb6/GjCYo/D6TFA6uQ2IlanrxyFSJ6hHfoqD2/JHdrS/AUj6akorR8hYvOKeeXxISew7S9st3qpHKySfM9Ieu8272LmGwUrp9K9U6lQjMO5PR/7ZH6gCDWcBIccCssMXJ9xnzVjWaw216kRTla9MKlLYtxP4eRxvDJGZyx3ChDCUPN1yMIQvfTMuELI7TmFWSRmxJtVMnA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1safnx-00069f-OQ for guix-patches@gnu.org; Sun, 04 Aug 2024 14:18:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v2 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: Sun, 04 Aug 2024 18:18: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 , Tomas Volf <~@wolfsden.cz>, Sergey Trofimov Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.172279545223289 (code B ref 72457); Sun, 04 Aug 2024 18:18:05 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 18:17:32 +0000 Received: from localhost ([127.0.0.1]:57167 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1safnP-00063V-Dc for submit@debbugs.gnu.org; Sun, 04 Aug 2024 14:17:31 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:36262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1safnN-00062G-3w for 72457@debbugs.gnu.org; Sun, 04 Aug 2024 14:17:29 -0400 Authentication-Results: purelymail.com; auth=pass DKIM-Signature: a=rsa-sha256; b=fNW373S0T5ZbVtWiu1nmcypffOabNkaYCSLz2PED8k0xjb5Qf72UvMMaAPfarfwKY+Z4mDahYiOUcphYvDp1wx2TQlaNxVhIlMbwH/h85UqE2nTXs2e2sR4PdF3bgcunlOGrvxC+JU+p/7eeM36X3p/qVCNwkFVTaGSAUFe8KL1WlM3U4s9LitsQo94JHeemnB0MiOJtJrCNcWwDwvr1qah8w89M7yxK5J0CmfHiRnjUCLyoaw9VpHvShCkWM+D/xmB119qavJgpSqqFX8UHutTlfM/JN+w9eeQ2gdQfWkectzpBD++Zly5LtBFbkS51eI5bAKN7ai4+EEBBsFVGaw==; s=purelymail2; d=lunabee.space; v=1; bh=1+K1cMVp+fD6IiJ/hWeAOXQkdR+3XoaOTauQoU1utuI=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=gnnmgkCUV+pBr/8hM8yUrDfhvpI2CILJ82cZiLR2vLi44BgjO1pAleVcyYsv/Km0uCPMpR0qiGw3bzgKtXt1M7P966H6kJ+4X6mJsqxl+XurFF8dz5lP6BDqxapeuVSNtbmy/nkGSzrOhTigoWKodnNlsGHoGGEiwVu4ObzGUORoG27MNHwNJGTtwS2zcDFMTvWAt1/n7e96fuYI2VWPOsnPPaPEc1pvp9HbObYqspnMiX9BPD5tStN4fqZGX6ITl+a+whuGdMVfszfirNYFaGaZtOLb/moZDmno7/QsH7pIhYxX850ESIMc2W6nZNvTUfH6pBy6DozO2Esp4JE87Q==; s=purelymail2; 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 -1097091497; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 18:16:48 +0000 (UTC) Date: Sun, 4 Aug 2024 13:06:06 -0500 Message-ID: In-Reply-To: References: MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by Purelymail 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: , X-Patchwork-Original-From: Lilah Tascheter via Guix-patches From: Lilah Tascheter Reply-To: Lilah Tascheter Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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)))