From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0Ie0FiVvfWGvSgEAgWs5BA (envelope-from ) for ; Sat, 30 Oct 2021 18:13:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sLtjEiVvfWGPHwAAbx9fmQ (envelope-from ) for ; Sat, 30 Oct 2021 16:13:25 +0000 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 20C2F3201 for ; Sat, 30 Oct 2021 18:13:25 +0200 (CEST) Received: from localhost ([::1]:41520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mgqyy-0003uf-8F for larch@yhetil.org; Sat, 30 Oct 2021 12:13:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48282) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mgqyc-0003uG-RW for guix-patches@gnu.org; Sat, 30 Oct 2021 12:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:46729) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mgqyc-0007Ng-JB for guix-patches@gnu.org; Sat, 30 Oct 2021 12:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mgqyc-0002Tf-EA for guix-patches@gnu.org; Sat, 30 Oct 2021 12:13:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51514] [PATCH 1/2] gnu: system: Add LUKS2 support for the root file system. Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 30 Oct 2021 16:13:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51514 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51514@debbugs.gnu.org Cc: Josselin Poiret Received: via spool by 51514-submit@debbugs.gnu.org id=B51514.16356103809515 (code B ref 51514); Sat, 30 Oct 2021 16:13:02 +0000 Received: (at 51514) by debbugs.gnu.org; 30 Oct 2021 16:13:00 +0000 Received: from localhost ([127.0.0.1]:58275 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgqya-0002TP-E5 for submit@debbugs.gnu.org; Sat, 30 Oct 2021 12:13:00 -0400 Received: from jpoiret.xyz ([206.189.101.64]:38042) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mgqyY-0002TF-4d for 51514@debbugs.gnu.org; Sat, 30 Oct 2021 12:12:58 -0400 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id A091C184D63; Sat, 30 Oct 2021 16:12:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1635610377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Zv9Gcr1iv3oUQ6N1bzyDp8YYn0niE8dMNIOqrBcRmQ=; b=Jh6T7ZyYOdL24GusoYojrMvdu6dx+F8Wn7nCwYKzOmOXcqhJV03r7TWLMb6zCPHakjMRYE TFjdu8TIsTUuGdeeRQRa1PMW2JhjOo06ZcBrA42gMX8Cyqb763WVcaRFFB+UQtq8qbabIy ePUPO+6L9fMOulJFapUywUKbkF4F3ZANvn+1VW5TGtKtfwI+EY/EpDRaDoPSYwrAILJBMF y4Nu8ykJPQx0f7hER4PTWfFxNLFKs+ZOpJ06Se9Y5I8VRRPVy1eQ9qf71wDDjYx744i6OW k65IAywz1k0UDY1q/KDyFokmeMe3+JPKF/yC8xBC8HJsnt1Py8Qsy/oi81ijLA== Date: Sat, 30 Oct 2021 16:12:36 +0000 Message-Id: <20211030161237.28298-1-dev@jpoiret.xyz> In-Reply-To: <87tugypkum.fsf@jpoiret.xyz> References: <87tugypkum.fsf@jpoiret.xyz> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: / 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" Reply-to: Josselin Poiret X-ACL-Warn: , Josselin Poiret via Guix-patches From: Josselin Poiret via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1635610405; 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-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=/Zv9Gcr1iv3oUQ6N1bzyDp8YYn0niE8dMNIOqrBcRmQ=; b=EGyNgTSkCuHMymRToBe7wdIaEa8JvG82ohszB2eKlAzcWpmEmhTnt0KU0WBaIF8MPgeIG/ RG81CMEmm89LRScQqFOoqoOWK7uM9MZXO5CkxJWf3T1Z6PK6XFNAlrDC3lkOQhRx0jZrLy 7O2F9BO4wpNs1N4ZY/Mv8wQHINe8nliUGQ+yvWPgWS+0y+S2dJ/+uBeaOeQO43beOqkDJu nnsmJxXnjOH8FvGqnMqUSsyBQv5UGUEi5cihJljUfKEHDr+29Hz/jVPgHKhiw19ybakbNK 2v52W93laqpE+EBRD36q4Du8ceiMmJ8CQHU+Qwyvmk5uo33b9WK7TKKdgd2JQQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1635610405; a=rsa-sha256; cv=none; b=dZzN1FrYIg5+iSTmDZ2AWs5FC4HPUq+UAXmzfaDThuq3nIET39Kt3uiewAYWDTlAol4xR6 K1Q3nVjO+XrVhkh83Dc+culfCVsXnu8y2ozr+xQ/aGvEDK+ys/Gb7a4Z7Mfg+LMblONA9O D/b3PTJWS0D9/vwzqiE7OJx+PGryQh+punY4YDCShAcn7umCtbRf4ALYlqzsnjsqLAAVj1 BzEHIZ68iy+IU65VhV1hGQw2VPzQ2TcaH6Badn1f5ZS8YYP23jCaCPrImnHMEPteR7rusT bXke+9kC/mTIGq+u8Gg9qXrlIjJKNTOIjusFmOE8MMv80NH+6Q5pVxVDMn9lLQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=Jh6T7ZyY; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 1.08 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=Jh6T7ZyY; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 20C2F3201 X-Spam-Score: 1.08 X-Migadu-Scanner: scn0.migadu.com X-TUID: o1/stjjHmbwT * gnu/bootloader/grub.scm (grub-configuration-file): Add 'insmod luks2'. * gnu/system/mapped-devices.scm (open-luks-device): Create '/run/cryptsetup/' directory. --- gnu/bootloader/grub.scm | 3 +-- gnu/system/mapped-devices.scm | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/bootloader/grub.scm b/gnu/bootloader/grub.scm index d8e888ff40..42f71aa4db 100644 --- a/gnu/bootloader/grub.scm +++ b/gnu/bootloader/grub.scm @@ -415,8 +415,7 @@ (define (crypto-device->cryptomount dev) ;; Other type of devices aren't implemented. #~())) (let ((devices (map crypto-device->cryptomount store-crypto-devices)) - ;; XXX: Add luks2 when grub 2.06 is packaged. - (modules #~(format port "insmod luks~%"))) + (modules #~(format port "insmod luks~%insmod luks2~%"))) (if (null? devices) devices (cons modules devices)))) diff --git a/gnu/system/mapped-devices.scm b/gnu/system/mapped-devices.scm index 518dbc4fe8..95944b03c8 100644 --- a/gnu/system/mapped-devices.scm +++ b/gnu/system/mapped-devices.scm @@ -192,7 +192,8 @@ (define (open-luks-device source targets) "Return a gexp that maps SOURCE to TARGET as a LUKS device, using 'cryptsetup'." (with-imported-modules (source-module-closure - '((gnu build file-systems))) + '((gnu build file-systems) + (guix build utils))) ;; For mkdir-p (match targets ((target) #~(let ((source #$(if (uuid? source) @@ -201,7 +202,12 @@ (define (open-luks-device source targets) ;; XXX: 'use-modules' should be at the top level. (use-modules (rnrs bytevectors) ;bytevector? ((gnu build file-systems) - #:select (find-partition-by-luks-uuid))) + #:select (find-partition-by-luks-uuid)) + ((guix build utils) #:select (mkdir-p))) + + ;; Create '/run/cryptsetup/' if it does not exist, as device locking + ;; is mandatory for LUKS2. + (mkdir-p "/run/cryptsetup/") ;; Use 'cryptsetup-static', not 'cryptsetup', to avoid pulling the ;; whole world inside the initrd (for when we're in an initrd). -- 2.33.1