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 CMWQC2tIr2YZ4QAA62LTzQ:P1 (envelope-from ) for ; Sun, 04 Aug 2024 09:22:51 +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 CMWQC2tIr2YZ4QAA62LTzQ (envelope-from ) for ; Sun, 04 Aug 2024 11:22:51 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=lPGu0734; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=dBctmpvz; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=dBctmpvz; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=wolfsden.cz (policy=none); 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=1722763371; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=OgSAU2R0/U66BS/jbK52EikqEAoeFznpPzm54gb5IGs=; b=gntkwVSEaHLdHbK6Fb9gvKgpSc1yf1CaNEP7eDTFRoiN2h7DI1YSP2NeFcYDdaHrMERD6m Q4s6jOa4Bh2ooO/lQ4hJ0w5OC91z+Yz6+CL/TcAwddE9SbHeqMlirOXSrBSdyYJSagxgCP 3AZGK1IIw/cBikIeWABM4bGeJpycUw37PpEgWQbkCl/wTQoHtsluamk/14GnwTGHre69LE m4T24ea2PAMJ2S5CNxRF82aOWMgE1PoUjkELc9pDeoICCF+xN0j81zmJpw2eZ8hQPL9qlv XL4LTTvxJUY/JqvRyOlbuq+FWAbj7WCq+e/MYhoo4IiIavuwPYR+G5f29G2iKA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1722763371; a=rsa-sha256; cv=none; b=kvGXUmz6Z7E9RP7RmJEWfYJlcBR0EYHUUbKWPvPLoFb41NLvzWXfGTqLiUCSntU0A02oE2 pLo1g/moRXI61CO3SFqsiDlr/ypvM2Nzg81TF74ypJEfc2OX0MoMKXAri5q3TbappRKpoO 0RF0aegRskMvztRK27Tqa3gZXhadMt9LTCX0Sb9SFpq8XOMoDQn9hgGdV6TnB5jPxWb5rS 6muQOD0ORerA0nPYXFcDGDba8dN9mFR7YxUD2XXw0eRRSTEiUAZAb6I6gG/aQjK4d+Qlr2 F9Uj3EeVKyoya9bCOrB2SATe/tmNyKP6tZzwLSXtO+VYW0h+THxOI+Ym4hPWDw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=lPGu0734; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=dBctmpvz; dkim=fail ("headers rsa verify failed") header.d=wolfsden.cz header.s=mail header.b=dBctmpvz; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=wolfsden.cz (policy=none); 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 8ABDC6C3F9 for ; Sun, 4 Aug 2024 11:22:49 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1saXRr-0003h5-W5; Sun, 04 Aug 2024 05:22:44 -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 1saXRp-0003gw-Ns for guix-patches@gnu.org; Sun, 04 Aug 2024 05:22:41 -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 1saXRp-0003uM-EG for guix-patches@gnu.org; Sun, 04 Aug 2024 05:22:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=In-Reply-To:MIME-Version:References:From:Date:To:Subject; bh=OgSAU2R0/U66BS/jbK52EikqEAoeFznpPzm54gb5IGs=; b=lPGu0734ccKsFmCY6kZuIwJUYKaU3PeuFRGWpKSB+Cb1UTmTy+gjBWCOjoPbOagp1sO/GQr9cFLAag4T3dlRqeuMj3SpUvkiP2PM4bl9DWv4eqHujjxQHpnBKZfUYfpSm1T4YEepIA2qcuidl7vnOaDEQHE0zSwPRAN+ZQx0FXm3ZmhXEM4jROrLBEI1luvIWh0Pv8qEoBREn3b5eucs/iV6D2u76Atv0NpzEUT5SqkpCnAgVpWd33+z1Nc+q6LR32nUrymHA2zoyK2szy3Lv4Ty0Ii0AwqjQ8i9RfsNfFgxqsuI6ZI+TvfgIDHYPjiw/hOOCsIbVEMLX2LAwyhi8A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1saXSA-0000yl-5h for guix-patches@gnu.org; Sun, 04 Aug 2024 05:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH 07/15] gnu: system: Fix bootloader crypto device recognition. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 04 Aug 2024 09:23:02 +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: Lilah Tascheter Cc: 72457@debbugs.gnu.org Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.17227633763741 (code B ref 72457); Sun, 04 Aug 2024 09:23:02 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 09:22:56 +0000 Received: from localhost ([127.0.0.1]:55513 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saXS3-0000yH-Pq for submit@debbugs.gnu.org; Sun, 04 Aug 2024 05:22:56 -0400 Received: from wolfsden.cz ([37.205.8.62]:51068) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1saXS1-0000y3-DO for 72457@debbugs.gnu.org; Sun, 04 Aug 2024 05:22:54 -0400 Received: by wolfsden.cz (Postfix, from userid 104) id C75B92B2275; Sun, 4 Aug 2024 09:22:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1722763350; bh=O46tsSC18OYx18YZ/d2BVJ6T6hO6sfLiSmjoRtjmVvw=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=dBctmpvzve/8HIRJS9cmoGXJFBIuHvLSRLiNXYnBbjzDpf19tnkyx2dsuYny0hvH7 Jv/36I/UqvL7V5WkzMeDx10p7uyeZU2VTjDv6YgpAYMOZANXcjaw0XpqxFrFmAcEqU nQAM1lJoRbi6s8kKxKiZjQWWSH/WtPrun+7A4Xij9d9iWk7Eq9o5LaNe+C3ajxa5rz kAjPqDf2Tv/DfBhXQaKZsCfFb2MlwsJMYowNbaOn7WvmoHnBfzErdbQPl6OpG7o7Gt nW3k91cvvViI+0xZoZQP/NYtf3qmjImiiwIub3ykdVz81q1hwyD0wE63S32eknKzPQ i9lOdtj2HYHy2YVqv14mBxnLG6/fV6HnKazvCfiKhmKnrkLuuHq0KM5+zepdgGlFsg zu4yQjUfkvxTfKJc0W3la66PDCQs0JT3j7qajjTE2yjGKkVydHQyyIiYwO8Q7AcCyf YHOdZXGxM/Nk0z3kOX9fWkSob1f0ZKvVwOGqKJjUiLV+omKbyGI6phHfeIwFtzgYwh AbrqKeh+KE68y/g7W6JTnKPhISBUF1f7Wuqc6/kyc7cHVaeOZcnlFtL/ILyIzKgD53 0F7s256eUNj6DBV24jORMcje9j8ahI2UyxYhssnkvEaM3AB6osQcJh+q2zD/7M3GX3 JZoGeR4SMDq/PRrnOmcrSgJc= Received: from localhost (unknown [128.0.188.242]) by wolfsden.cz (Postfix) with ESMTPSA id 021FB2B3733; Sun, 4 Aug 2024 09:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1722763350; bh=O46tsSC18OYx18YZ/d2BVJ6T6hO6sfLiSmjoRtjmVvw=; h=Date:From:To:Cc:Subject:References:In-Reply-To; b=dBctmpvzve/8HIRJS9cmoGXJFBIuHvLSRLiNXYnBbjzDpf19tnkyx2dsuYny0hvH7 Jv/36I/UqvL7V5WkzMeDx10p7uyeZU2VTjDv6YgpAYMOZANXcjaw0XpqxFrFmAcEqU nQAM1lJoRbi6s8kKxKiZjQWWSH/WtPrun+7A4Xij9d9iWk7Eq9o5LaNe+C3ajxa5rz kAjPqDf2Tv/DfBhXQaKZsCfFb2MlwsJMYowNbaOn7WvmoHnBfzErdbQPl6OpG7o7Gt nW3k91cvvViI+0xZoZQP/NYtf3qmjImiiwIub3ykdVz81q1hwyD0wE63S32eknKzPQ i9lOdtj2HYHy2YVqv14mBxnLG6/fV6HnKazvCfiKhmKnrkLuuHq0KM5+zepdgGlFsg zu4yQjUfkvxTfKJc0W3la66PDCQs0JT3j7qajjTE2yjGKkVydHQyyIiYwO8Q7AcCyf YHOdZXGxM/Nk0z3kOX9fWkSob1f0ZKvVwOGqKJjUiLV+omKbyGI6phHfeIwFtzgYwh AbrqKeh+KE68y/g7W6JTnKPhISBUF1f7Wuqc6/kyc7cHVaeOZcnlFtL/ILyIzKgD53 0F7s256eUNj6DBV24jORMcje9j8ahI2UyxYhssnkvEaM3AB6osQcJh+q2zD/7M3GX3 JZoGeR4SMDq/PRrnOmcrSgJc= Date: Sun, 4 Aug 2024 11:22:29 +0200 From: Tomas Volf <~@wolfsden.cz> Message-ID: References: <5e2268ba496538cd8cb619f4e1e03f94ae17f980.1722741997.git.lilah@lunabee.space> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="4hfbD93aW6xDMagF" Content-Disposition: inline In-Reply-To: <5e2268ba496538cd8cb619f4e1e03f94ae17f980.1722741997.git.lilah@lunabee.space> 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: , 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: 8ABDC6C3F9 X-Migadu-Scanner: mx12.migadu.com X-Migadu-Spam-Score: -11.98 X-Spam-Score: -11.98 X-TUID: neyl4ZC9ifT4 --4hfbD93aW6xDMagF Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On 2024-08-03 22:55:27 -0500, Lilah Tascheter wrote: > * 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 | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/gnu/system.scm b/gnu/system.scm > index 66c1a80733..8926e1b065 100644 > --- a/gnu/system.scm > +++ b/gnu/system.scm > @@ -400,10 +400,11 @@ (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))) > + (let* ((luks? (lambda (m) (let ((t (mapped-device-type m))) > + (or (eq? luks-device-mapping t) > + (eq? luks-device-mapping-with-options t))))) I think this will not work as expected. luks-device-mapping-with-options is a procedure to be called, not an object you can eq? against. Typical use case: (mapped-device (source "/dev/sdb1) (target "data) (type (luks-device-mapping-with-options #:key-file "/crypto.key"))) > + (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 > > -- There are only two hard things in Computer Science: cache invalidation, naming things and off-by-one errors. --4hfbD93aW6xDMagF Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCgAdFiEEt4NJs4wUfTYpiGikL7/ufbZ/wakFAmavSFUACgkQL7/ufbZ/ wamhbRAAs0Em3Q0OAsGsdd0j8fH1CCS/6KkWXKW7tNWPh1gK6NDhH/CIbm3CvQHU 5ovmZUXqUW0YN9Cg+Yjy5ubno+bKnMtiiY6CblAzWFDtNlI5wTw15sItK1py8oSC /vW6bAhMzW2vl2jIaiaRHE4Q8sGY5BRlAxmeRtDhRlRzHhKMbFBEqIGBfyS5yRYm zJhYUQ+48K9IKAO4lG1mIuo1WOGunjhar5jpzuJBFVye4EIsyHB08hN91tRqa3q7 QMikcEc/vYoYKtnhgzZpdogpwIxAc0bJ2blavpHtSb1XkIUwDtYB8cWu4e5dlwXf DkW4SSDKfhib8T0Ih40jyZ+tDpbAvgqeKdgHovfG1Ac9600UGyiRNO68LOmVE1qF jZtOyl8VkjyZA0UeiOBMlsM2kMNVN3B3OYw2eBka1D2908wNOd9BTnAAOf4TzUpn Y2BJjiLxo/uJt99Un9qZKn7dig2dq9ZGsGPNDsjYebk/rna1valh/HcoP2XvyiqJ E0P3MJmWL+x4hu1Fh7kuh5y/+JNpVam+DmJvbgNwTn7r3ltIgrmt0IT1xdobPcYS jKLV2Mn0dOJ+YgEpBe/GjwcUSpTAkrwR97ZuV2d1m5dUNseycIkbBAxWDAa7cmPd SL2Onuw1ulpcsVARxATMiOpScb4i8ALEU2pI66LTOZ2h4WP7AKg= =nk9F -----END PGP SIGNATURE----- --4hfbD93aW6xDMagF--