From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id QGYeO03mr2bdcAAA62LTzQ:P1 (envelope-from ) for ; Sun, 04 Aug 2024 20:36:30 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id QGYeO03mr2bdcAAA62LTzQ (envelope-from ) for ; Sun, 04 Aug 2024 22:36:30 +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=PHz7KNwh; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=A5yeEhKC; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=ENWoYQns; dmarc=pass (policy=none) header.from=gnu.org; 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" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1722803789; 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=HWMSoLtkSe3PTDcvQjaL3dis4w8oBxgXvqhA1sOdQD1wPUkTgwTbDiXIatOCpGvbBOEyaB 9ve4Jf5Q6LPjqkjJ+1BnAjOvhTZRa3GNjwomJBCrOzhbaRRz3ns5bMib2lEQZ+I7BTshy0 GAscBThH2GNT3EYTxSLUjDfKqcnyNZj8K/RUu/RsLg7gs7IeRsBF0iLw3IL7RTdwMhROsR AdRGqkwnsIR88+sj0RMwzgAmk/1qfBfD0iVXf4fnBrk/1AXDfiY/ST/b0fiyeg7Qwx/zcW LJa/PcGo+ksojtJAoN+O0bQf8csQkwjgSy5yO+dCMcXbpjsnAvZUHOg92CZ8GQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722803789; a=rsa-sha256; cv=none; b=tT/sA6Zk+zlC6/NWUmuOtftM+NZyKPqRORdH+GCnUYbYe7uaE730ei+ZeW5/1g6j3FSe7y lTDW/fORFO9FyZq98vb8gTerYBY2aGCj/zMdEzw6rAS2Pa1j0MA6katgbQnACZzfIPsVTe icd9nwKRGzx4CM0S5o+T+0s+iUNPjEWKGs/BQIAjwWCes6qPjKcY0ew/b5aW2si/fLh2zk 17S/f/WVs7goAz2KwQ31jHBjnaZ/ELNpVjOGN0TRJgEkSkFmWf7i5JZatUNz7Ed6QcaYcR Mbjaw9SJCpE7usejac2HhC5ibJ7PXYPZJV2/VY1qOdDT7rS54sx3cUrdYyHCbQ== 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=PHz7KNwh; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=A5yeEhKC; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=ENWoYQns; dmarc=pass (policy=none) header.from=gnu.org; 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" 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 D4CA51242F for ; Sun, 4 Aug 2024 22:36:29 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sahwD-0002Gk-Le; Sun, 04 Aug 2024 16:34:45 -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 1sahwC-0002G6-6O for guix-patches@gnu.org; Sun, 04 Aug 2024 16:34:44 -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 1sahwB-0008KK-TP for guix-patches@gnu.org; Sun, 04 Aug 2024 16:34: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=PHz7KNwhFtVz25sjD6YhgHLWscCgJ4vC1FcW01tEdMa2SBMaDOzHbKpnNb7okKiH+tSIlTyc8EIj2V6UQeAbgLRItgRwAItbtSa0iM+nPqufK40iwLdA/cuQA2y3LHay+qP5/a5PdKQZFAsQYUP1TvjvAesYHER2eGo70pIECMlJA3DHw6w6fhBW2uHfcYFnU39fONleIcVOPcfb7k9Y/BabHB2akiknp6S+GcjKvQjRAyyvcjK9/jqjm6FCXbUqib6DzjWtZTzAv5oAqPav687SRd+EpMThgzTCNRDSszGwbF4I62b1kbplO6g88k+RK0JZp4jW8gIoZZNB8h/JFg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sahwX-0006On-AQ for guix-patches@gnu.org; Sun, 04 Aug 2024 16:35:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH v3 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 20:35: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.172280366224277 (code B ref 72457); Sun, 04 Aug 2024 20:35:05 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 20:34:22 +0000 Received: from localhost ([127.0.0.1]:57353 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sahvp-0006JO-LU for submit@debbugs.gnu.org; Sun, 04 Aug 2024 16:34:22 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:35044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sahvn-0006IO-Oh for 72457@debbugs.gnu.org; Sun, 04 Aug 2024 16:34:20 -0400 DKIM-Signature: a=rsa-sha256; b=A5yeEhKCkcodNP1QWLmJ7CObQvKxiadk6GRGq18K0xL+Clgqi+fsyxnUQ8LNDsaa3hF+o18IlF4OuSLxbBqG44N9qPQYl0ySSDxqUNjBY1rPrJ0ylmhh7qAkQob/+1Rj9F8gC6uJJhf06gLS8V0OWk4qJL9z2b3q7UT3oJA5r8VIDMUfkteX9r/+Gyh+j5SChc4NkoWs9yLoDLS8hDcyZOSuNFhNCtyBAONtmCrUjAvWDw+ArTY9ge3zzubKrjjtqAOP7bvhClzNPxFithkxadzmTMGN0A5fmRA/u3gB1UfRbt++ywaOa8s02ZsOjpiKlE75ED2Jb8u0e3HEoYeQuw==; 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=ENWoYQns8wlwadfjo/5creQPjl9beAbVyoMyhH8H+0Y+4cqTOnN+n1ehB0wlGwq42uLqJXQayfrNWU3DBD+UFVZDbUNOsmIwgTKqqXPxdTpN4FWm1qfQDRrrJlfX1qrGxRVGVdl2SSHAabceNXg8bKysKmscbO9qU/t/f90JTvpo68IwoX+WOn1KrPvxADxFG+Pf1UB3niEQXS8drCz5pEZRzYiP/9SPA0lnFDlFUQINwZ7FwnP0D20FKZLJNvi4izG4QdRrzf766lTkrpf0Tr6WeYRTql8VWW4abSaqjuKr6nEtF4+EQ7fymS2FcwvU9mZm/HJ9dMGDc0XZP8Pfrg==; 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 -1317130453; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 20:33:40 +0000 (UTC) Date: Sun, 4 Aug 2024 15:31:53 -0500 Message-ID: <0a87dfd7b7f40c55ba99df7952dd3eb2c2e5f183.1722803521.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-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Queue-Id: D4CA51242F X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -6.94 X-Spam-Score: -6.94 X-TUID: XPrFWCV7ypwu * 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