From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SGRMDPjIkmFtbgEAgWs5BA (envelope-from ) for ; Mon, 15 Nov 2021 21:54:16 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id gE0MCPjIkmFdUQAAB5/wlQ (envelope-from ) for ; Mon, 15 Nov 2021 20:54:16 +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 DFA2D340F6 for ; Mon, 15 Nov 2021 21:54:15 +0100 (CET) Received: from localhost ([::1]:36560 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mmizW-0005B1-OE for larch@yhetil.org; Mon, 15 Nov 2021 15:54:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:33488) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mmizL-0004t5-Kr for guix-patches@gnu.org; Mon, 15 Nov 2021 15:54:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44775) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mmizL-0006Qb-Bh for guix-patches@gnu.org; Mon, 15 Nov 2021 15:54:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mmizL-0000q3-Aa for guix-patches@gnu.org; Mon, 15 Nov 2021 15:54:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51514] [PATCH v2 3/3] installer: Make LUKS2 the default format for encrypted devices Resent-From: Josselin Poiret Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 15 Nov 2021 20:54:03 +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: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: Josselin Poiret , 51514@debbugs.gnu.org Received: via spool by 51514-submit@debbugs.gnu.org id=B51514.16370096423210 (code B ref 51514); Mon, 15 Nov 2021 20:54:03 +0000 Received: (at 51514) by debbugs.gnu.org; 15 Nov 2021 20:54:02 +0000 Received: from localhost ([127.0.0.1]:56317 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmizK-0000pZ-1z for submit@debbugs.gnu.org; Mon, 15 Nov 2021 15:54:02 -0500 Received: from jpoiret.xyz ([206.189.101.64]:36818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mmizA-0000ok-AL for 51514@debbugs.gnu.org; Mon, 15 Nov 2021 15:53:56 -0500 Received: from authenticated-user (jpoiret.xyz [206.189.101.64]) by jpoiret.xyz (Postfix) with ESMTPA id 691D1184F66; Mon, 15 Nov 2021 20:53:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jpoiret.xyz; s=dkim; t=1637009631; 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=o/YhAdswtSrepNNN/Zym+E/dEk7sid/PoZhCYlPPL/E=; b=q+PJwxnLzNwX5oE9auhJY1OtcIRvL6ZjZYgnpPO7jFZOvFMEN+bu5yngaNhuCMtl/Aok58 9PMKNBoHitFpd5MWmWNhXcsC2BtS42bEtS82Xl9qkV0DU4IMQoBkenmauUElKt29Q6c+1N fJIi/H0QBw7PcL3OTI/BY2s58nBbx0Bh1uQ8FJRN5Z60Zog09mn57mAJcMxoyvgxfqdvQT qHelpaUsOkRxuQnV6t5lvB5MjkC7IcZBPKt7FPGc2w5OKzHwRfqqWqEdDHb07o0FDkfiP1 LoBbUsLS5UR4A7lMewF8A09PjiZeJ1a7IiMTi/EgOKxOc2EX/6pT3ePL4/GNrA== Date: Mon, 15 Nov 2021 20:53:41 +0000 Message-Id: <20211115205341.9724-4-dev@jpoiret.xyz> In-Reply-To: <20211115205341.9724-1-dev@jpoiret.xyz> References: <87h7chdmzh.fsf_-_@gnu.org> <20211115205341.9724-1-dev@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 X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637009655; 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=o/YhAdswtSrepNNN/Zym+E/dEk7sid/PoZhCYlPPL/E=; b=OGpgNFERfBNos95XFtTfXnTApazREirglgRuEyRjKDy4XIuMLGSWRkWbU13ycgAoDnkWPT atWx56bDaSgg4Bc94kOrbBtDLXDtaZlObOhWqMd70NojMMJwk2yNe2/D5/QTz3jRid1L4L zHdPTywO47gtrhwbFtyaNYN9nxjUsQpvjrF6r5Z7D1toBL3vDvW8JiLKLTL+iu/g2muirH hA+JCRk531y/05OqUFZtN0JwKc3HVT1OrJxJpR8x4AXwY9M3oVXuKsSTurbnVmMr0dvkCy 4OZUIG8vJkx3EgP/kS1qgu9HICKRhxbb08tKmQpf5Sq/ojoIu0Af01dhgp1qhA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637009655; a=rsa-sha256; cv=none; b=US3nRkj38caYpbnY/y1yI2LEIsEVN6T0+sgve+pvyujtXyhO96GKlfRhLB0wnknXBoNCPj fH/BJ3DiMliQwa9MxSNimVepY1ByVkEeiVIDW2B22K1tFeoQUkwps5IZo9g2sTkCXiVyNa Dd46FXFg1rs8tOZ1dSom243XsFkWskl7sp480vXF7vmNc2eRJwAOJP7Zqv9hxtFYSSgGHm kCMOHlZhjaeCj7+yYGMAQE/CspypqrfG9jXiNpvZiHsdcJBZvt1HuzPlbs7l0A/GC3mfNL bV784CSB+mjZLyXFxjtBgtkc2krV2C5HmOG2Rrj2rF5slGNJ/0r4+tJymmu1Zw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=q+PJwxnL; 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" X-Migadu-Spam-Score: -1.34 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=jpoiret.xyz header.s=dkim header.b=q+PJwxnL; 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" X-Migadu-Queue-Id: DFA2D340F6 X-Spam-Score: -1.34 X-Migadu-Scanner: scn0.migadu.com X-TUID: UMBexlVt69wX * gnu/installer/parted.scm (luks-format-and-open): Change it. --- gnu/installer/parted.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm index cbe676017b..00de0a30fa 100644 --- a/gnu/installer/parted.scm +++ b/gnu/installer/parted.scm @@ -1165,8 +1165,9 @@ (define (luks-format-and-open user-partition) (lambda (key-file) (syslog "formatting and opening LUKS entry ~s at ~s~%" label file-name) - (system* "cryptsetup" "-q" "luksFormat" file-name key-file) - (system* "cryptsetup" "open" "--type" "luks" + (system* "cryptsetup" "-q" "luksFormat" "--type" "luks2" + "--pbkdf" "pbkdf2" file-name key-file) + (system* "cryptsetup" "open" "--key-file" key-file file-name label))))) (define (luks-close user-partition) -- 2.33.1