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 yJXfIQ78rmZ63gAA62LTzQ:P1 (envelope-from ) for ; Sun, 04 Aug 2024 03:57:02 +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 yJXfIQ78rmZ63gAA62LTzQ (envelope-from ) for ; Sun, 04 Aug 2024 05:57:02 +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=G0T4aY4E; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=hyZZs+W0; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=gZos+4wp; 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=1722743822; 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=+uPqlhaI3gEwdn4Wt0CXS+QL7/L6z8sw2q9dsNsVmNE=; b=Wtw8oOYy0vCLq9dbfrPAPsSkK8SsgoCVHm+pjiUyGZq+cxL5FhdkPZrOyoGbkYmaC5+vJl eizZvw3LHUuiM83s5MC3bb6mHVFUpM6ckWTR2BwvdFVrCEFsXFBO1Fv+D8lApO9XgOKeFZ evvhuWZ77OzIyQx7oq6W50AFRKIQRiqOGhYUkN76Crd8sAbc82kDVltaj88I++0ig7XvBt 2oZNTDRo1TU6aQgPb3yi4d7wHz41xTKBowCcRzuoJ53uRhCJhW+DPvmdXJu9bdJhIu7LMb WRm+rWsBu7NUKWVL6O+f845iqNcZeQF3dGIcpHKfM7pUNGdBxbyghhMOdw+IKQ== 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=G0T4aY4E; dkim=fail ("headers rsa verify failed") header.d=lunabee.space header.s=purelymail2 header.b=hyZZs+W0; dkim=fail ("headers rsa verify failed") header.d=purelymail.com header.s=purelymail2 header.b=gZos+4wp; 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=1722743822; a=rsa-sha256; cv=none; b=Ej/G3VI4JtEzgejp0pEujzGiGpnZwMbXlZ/kQXDQJ6CT2noRK6I5/Nj6DQG3snbdZmOeCr hSub2wbldZwAcsqhWznyz5QXOK0wbxylQ9aDD0gyS50VsgmgzhsjKsu///2Hcfl3uqdgqG aNt6HW74ePCl5ws2bXgQIJpuuL+F3xLeFus/1KcHOO0++0qUKTHwCccwB0PUyLzwwYg8tP JKt9LfNGruWJnjCQJwo/vvsbJCrNd90QI5B9ZMwwQGMmbNCgAtpPMqZyldnZxEYw8vebhr oRTEL8rphfnpE6XA4JoYCgUYj+3HRdgqZmiQSrNHEU/oHKGl3F4Tioptzr2W9w== 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 667DC61955 for ; Sun, 4 Aug 2024 05:57:02 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1saSMQ-0007Ky-1B; Sat, 03 Aug 2024 23:56:46 -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 1saSMP-0007KO-53 for guix-patches@gnu.org; Sat, 03 Aug 2024 23:56: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 1saSMO-00048Y-R9 for guix-patches@gnu.org; Sat, 03 Aug 2024 23:56: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=+uPqlhaI3gEwdn4Wt0CXS+QL7/L6z8sw2q9dsNsVmNE=; b=G0T4aY4ELlyYXPMTWjLsDgY+hKJcQty5jHr/VU/nLvuQFlf6ZxdHcG8Wp7POtqskx2NcLDt2r3xEIUQ3F/vH9WFFIVGUqrBwOd72pW3zsE7wUPODEs+Oau09kundrwyXTvywdwkxQaqUQlwhtFPXlXQzYqI9P1upzddYBZgcTS9gdKUGQKUAGmuVoJS8yz4UHWlKPMQVL4l9byS0GiVVKvtF/wK8vZKZmD9XvFZJqNYb8cQTue9PN4pgHXEPtCvCMUSOvZ7tMDdK2eeK1n1X6H1EYwITR3p3stzpCam8p3AVJQ9XwSie0uZz9TFU4NXksOGQROIsgHqiZsIYlocKVg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1saSMj-0001JO-9r for guix-patches@gnu.org; Sat, 03 Aug 2024 23:57:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72457] [PATCH 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 03:57: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 Received: via spool by 72457-submit@debbugs.gnu.org id=B72457.17227438234998 (code B ref 72457); Sun, 04 Aug 2024 03:57:05 +0000 Received: (at 72457) by debbugs.gnu.org; 4 Aug 2024 03:57:03 +0000 Received: from localhost ([127.0.0.1]:55126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saSMg-0001IK-AN for submit@debbugs.gnu.org; Sat, 03 Aug 2024 23:57:02 -0400 Received: from sendmail.purelymail.com ([34.202.193.197]:60932) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1saSMe-0001HK-6H for 72457@debbugs.gnu.org; Sat, 03 Aug 2024 23:57:00 -0400 DKIM-Signature: a=rsa-sha256; b=hyZZs+W07HWU/vcgol9e+77gL6igtTXsy8zsUkncjd1lrSMjS1C6QeKGCMPYfJmmdnBYqbAvPKqTTWGFxxUPj5a/wyvTfmrT9FqUVHnldVZO2GWB/omqIORILFmjA0UQ7yzcigvasjzemB5hVgy5TAb5CJm7tJ9WzwY382rZ7xQMNMyWtwtXBYWRVsSgIT23gnaaeVw5WndjUNtRgN+zZK8rTuF4w96Zo0I3JnXS2woGVDtDBLNTyiV5dHvckVLI/z13twpMffc567Ja7Ph+BexaM3VDQtbUSksL30Ty+PhhWbzcfhJFN1plDYvBkz8SSwHpRgrpl44a5YWXrU2Ejw==; s=purelymail2; d=lunabee.space; v=1; bh=Ah9CLVBcDTaZ5RcpiC5z+6KGLFYPJcHfaojDo2DjKLE=; h=Received:From:To:Subject:Date; DKIM-Signature: a=rsa-sha256; b=gZos+4wpbLFrgV4l0N0u394HUUyXGS6WDvZTrdrZFam4h7SHdKKMfHmZ5AQsVXgs2xuDHbccu6kFNSHDtpXhyKYTeBwuuTmCxaDfRF9yJIHdq8Sxdjzv0fNYBtwEGGDKOyrIM9FrQsTX7ug6my9H611ubtiU/vNVk3KmQfilzBtr55wqZa+mXOqwbHNpd7RVwzFIfTtl2nVidClo52F6cP0wK1y0YjyEk5uXnLs/7mRXcETmjuuAaQ2WsW7zp3vA53cnJW4b5tDPP0V/PLkRSg0GI4IMxnO6SV44m7LCvT5zDFabAnF9U/iqhNNpVA33gzbDC3c3MqsU0rwG+XREOA==; s=purelymail2; d=purelymail.com; v=1; bh=Ah9CLVBcDTaZ5RcpiC5z+6KGLFYPJcHfaojDo2DjKLE=; 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 1753051598; (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384); Sun, 04 Aug 2024 03:56:23 +0000 (UTC) Date: Sat, 3 Aug 2024 22:55:27 -0500 Message-ID: <5e2268ba496538cd8cb619f4e1e03f94ae17f980.1722741997.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-Migadu-Queue-Id: 667DC61955 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -6.94 X-Spam-Score: -6.94 X-TUID: +ik+GrUcFMhV * 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))))) + (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