From patchwork Thu Jan 11 17:32:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomas Volf <~@wolfsden.cz> X-Patchwork-Id: 58790 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9A35527BBEA; Thu, 11 Jan 2024 17:33:31 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,DKIM_ADSP_ALL, DKIM_INVALID,DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CA20F27BBE2 for ; Thu, 11 Jan 2024 17:33:30 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rNyvU-00045U-1U; Thu, 11 Jan 2024 12:33:08 -0500 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 1rNyvS-00043S-Uy for guix-patches@gnu.org; Thu, 11 Jan 2024 12:33:06 -0500 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 1rNyvS-0001gi-La for guix-patches@gnu.org; Thu, 11 Jan 2024 12:33:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rNyvQ-0007hz-3n for guix-patches@gnu.org; Thu, 11 Jan 2024 12:33:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65002] [PATCH 4/6] tests: install: Use the smallest possible iteration time for LUKS. Resent-From: Tomas Volf <~@wolfsden.cz> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jan 2024 17:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65002 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65002@debbugs.gnu.org Cc: Tomas Volf <~@wolfsden.cz> Received: via spool by 65002-submit@debbugs.gnu.org id=B65002.170499436229569 (code B ref 65002); Thu, 11 Jan 2024 17:33:04 +0000 Received: (at 65002) by debbugs.gnu.org; 11 Jan 2024 17:32:42 +0000 Received: from localhost ([127.0.0.1]:33750 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rNyv3-0007gk-Pg for submit@debbugs.gnu.org; Thu, 11 Jan 2024 12:32:42 -0500 Received: from wolfsden.cz ([37.205.8.62]:45650) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <~@wolfsden.cz>) id 1rNyuv-0007fn-BD for 65002@debbugs.gnu.org; Thu, 11 Jan 2024 12:32:37 -0500 Received: by wolfsden.cz (Postfix, from userid 104) id 3B3D5250E80; Thu, 11 Jan 2024 17:32:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704994355; bh=iOcm3XSQu3Wcq9/ZZ6OC8iMlzYTIqZESK0ENVvjZq44=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=adslW5eu9GyogOr4HGLXsL/bAgUz4dF/OlEj5ysjTV/Iuwv+hKXm8dEK/QLfP0bDU e3RRGuaKy34aSzmU7s9sVUDRoR8zJyZ18RkfgbvxH1Q+CtV4FBvi10OjYhGPx4R+JJ 3CdjEZd3I2kHRckpHoU7cgqgAk9JJme/vW9k7xkYV2nz+DBwinD7WafVzOKrqO+Btp 6NYFs+7UZEPRuRTJdxW1oZroGlkHoTEf9wtJDD+yNXrl+J4djluCZP2hx3MBXrulq/ MZiuDXMeW4Ycg9GcgTdKORkK0Kmq4FYUg7RG8m0wf1wnCRtbgpSfhy67c/yAjf076B IvczGGNEsVAakhSw4rviRiRMiN34SNksA8rVXnYl2rUOCUgzTLNy0zNOJy2Ox33hmx vDzWkKG+fKt7QD6pF29w0nk9cw7MyU5E/+84Q97RdoEtoAnwqzdNAj92HHUIQNxwbd ziM0GySZGhaXGC1CADCRNZauyvQ9n7kiUhVfet3i4eq/I+CgocFXyNdySRQIUtomGj U8BWowHy9LhjE9y/2fs3/vjFbEBLQ0fPlUDVP1URbXhz1H9b3+Mo81GCl9IrARjjuH yrS0zAEl+TqO1WRBRNwmo2lgocUu9NkKAs/qQ8yBKh+GAwCwhVfhGuU7hnS/1LxUcr pAOmT5UuC7yzyQcL6ppTNQSU= Received: from localhost (unknown [193.32.127.158]) by wolfsden.cz (Postfix) with ESMTPSA id C96A6250172; Thu, 11 Jan 2024 17:32:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=wolfsden.cz; s=mail; t=1704994354; bh=iOcm3XSQu3Wcq9/ZZ6OC8iMlzYTIqZESK0ENVvjZq44=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=LPR2zbrC7FdRPjE8x1jPsCiFxy7euWWg0wdxAuy2zKACQXHHIFFEfKvQCkol8tX9/ 45l5I5ByAOeQWwWRR/d8PixZYFlAZCoLX6BupjY4RL5s/4oD1OIte4MN4DHbdjmMbF DIXk6NGYELoPv0F7ZAzJ6ocy4ip8YER/Orar0JyoRtYWinkCMfUCu1r3ZKfPVh6rAH HlQDe9s0TRG/LSQ2WOL9Y2RdRUSisGbUvq0JGXgfAssew46fsw/4A7R/JlHA8iEJgo 5LkwQHm9+uTW6lUhUWnLD24imWM2enHiK7xDB25tWpZhq+DzAC5DHvx3dAHOHurM4u lmDhMIX/lPlTJkFJxe02PmbHPXCWhn2FI16i51WpgWjx+RLUTvkEUysYmpJUyxTNYb x88Kb3pp4npsqKMDxFvGVSKVpJnNlO1mw+rhG7V+X3gnCUL4RGIRjiPYESQ/poOVdi IzQdeeJlYbVHpHqH6lyPVgB3msjLC7yUxkzFAJw0mywv4nnxV69iWIUdMRQBTg5UdO +dJ9Ndw1DOnihF8yO5s3C5Y9EaftkO1jYHJO8owdNmbSMfio1jS+F5K+qNHmIDQGO5 QDrt405eM7j16l5h1i871tHgd/tV83CM/IzukavYWl+nOBgDsdKGZPrC8N7Nq+F06g zK9/m3hD/PlR3OwDex+iBPAI= From: Tomas Volf <~@wolfsden.cz> Date: Thu, 11 Jan 2024 18:32:14 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches For testing that installation works, there is no need to spent 2000ms (the default) iterating while generating the encryption key. This commit therefore sets the iteration time to the lowest possible value, 1(ms). * gnu/tests/install.scm (%encrypted-root-installation-script): (%encrypted-home-installation-script): (%encrypted-root-not-boot-installation-script): Pass -i 1 to luksFormat invocation. Change-Id: Iab79459b48bebe4d293b18290a236c6414fb27fc --- gnu/tests/install.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/tests/install.scm b/gnu/tests/install.scm index 6794bca145..c5243f2ed9 100644 --- a/gnu/tests/install.scm +++ b/gnu/tests/install.scm @@ -755,7 +755,7 @@ (define %encrypted-root-installation-script set 1 boot on \\ set 1 bios_grub on echo -n " %luks-passphrase " | \\ - cryptsetup luksFormat --uuid=12345678-1234-1234-1234-123456789abc -q /dev/vdb2 - + cryptsetup luksFormat -i 1 --uuid=12345678-1234-1234-1234-123456789abc -q /dev/vdb2 - echo -n " %luks-passphrase " | \\ cryptsetup open --type luks --key-file - /dev/vdb2 the-root-device mkfs.ext4 -L my-root /dev/mapper/the-root-device @@ -970,7 +970,7 @@ (define %encrypted-home-installation-script set 1 bios_grub on echo -n " %luks-passphrase " | \\ - cryptsetup luksFormat --uuid=12345678-1234-1234-1234-123456789abc -q /dev/vdb3 - + cryptsetup luksFormat -i 1 --uuid=12345678-1234-1234-1234-123456789abc -q /dev/vdb3 - echo -n " %luks-passphrase " | \\ cryptsetup open --type luks --key-file - /dev/vdb3 the-home-device @@ -1155,7 +1155,7 @@ (define %encrypted-root-not-boot-installation-script mkpart primary ext2 50M 1.6G \\ set 1 boot on \\ set 1 bios_grub on -echo -n \"~a\" | cryptsetup luksFormat --uuid=\"~a\" -q /dev/vdb3 - +echo -n \"~a\" | cryptsetup luksFormat -i 1 --uuid=\"~a\" -q /dev/vdb3 - echo -n \"~a\" | cryptsetup open --type luks --key-file - /dev/vdb3 root mkfs.ext4 -L my-root /dev/mapper/root mkfs.ext4 -L my-boot /dev/vdb2