From patchwork Thu Dec 16 13:06:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Othacehe X-Patchwork-Id: 35275 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 6593727BBEA; Thu, 16 Dec 2021 13:10:11 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable 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 B178B27BBE9 for ; Thu, 16 Dec 2021 13:10:07 +0000 (GMT) Received: from localhost ([::1]:52342 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mxqWK-000764-8Z for patchwork@mira.cbaines.net; Thu, 16 Dec 2021 08:10:05 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59960) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxqUQ-0005mh-3Q for guix-patches@gnu.org; Thu, 16 Dec 2021 08:08:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51692) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxqUP-0004bJ-26 for guix-patches@gnu.org; Thu, 16 Dec 2021 08:08:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mxqUO-0006gL-UW for guix-patches@gnu.org; Thu, 16 Dec 2021 08:08:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#52550] [PATCH 09/10] scripts: system: Use the disk-image size argument for VM generation. Resent-From: Mathieu Othacehe Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 16 Dec 2021 13:08:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52550 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 52550@debbugs.gnu.org Cc: Mathieu Othacehe Received: via spool by 52550-submit@debbugs.gnu.org id=B52550.163966004425569 (code B ref 52550); Thu, 16 Dec 2021 13:08:04 +0000 Received: (at 52550) by debbugs.gnu.org; 16 Dec 2021 13:07:24 +0000 Received: from localhost ([127.0.0.1]:34995 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxqTk-0006eE-0Z for submit@debbugs.gnu.org; Thu, 16 Dec 2021 08:07:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:58902) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mxqTc-0006dA-0R for 52550@debbugs.gnu.org; Thu, 16 Dec 2021 08:07:16 -0500 Received: from [2001:470:142:3::e] (port=33804 helo=fencepost.gnu.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mxqTV-0004Sp-RM for 52550@debbugs.gnu.org; Thu, 16 Dec 2021 08:07:10 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=1LAqdqC8QqM0gZ724VXeCDguVqKfpTASfYWs4/EizIA=; b=l9ylw/g9h5hAXfZGaAL8 xDgb9HEp+4FZ/i3Lhf4vs6LjI4bC/vA9yjGhnQ6iVYtTBIrQMQLElPfSBNZtyTARr401xOUTDMNUd bF9O1RWTy6s1zbYufTAoUtmSRCWIdrNCGxSd/wock8FkEkux8mGgrE/hYmW9aJjdCrX2nVZTTvVa5 rJ0IQxLkjs5fH00a89zQvH7c7X2hC06fZxuzlHieGnjm+vnsKMmLnFnNXUDp9cHbQVynl1No3GSsk SgkS5JZCwg5xGWN7ryIMG1cfuTXcvzCfckH1MqKF0yMfXVS9Xy4js4h6AK4i1nMzds/jPY3bcHxxv lExI2SAuFjjepA==; Received: from [2a01:e0a:19b:d9a0:2f3b:16f2:b776:3ef9] (port=57550 helo=localhost.localdomain) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mxqTV-0003iQ-Io; Thu, 16 Dec 2021 08:07:10 -0500 From: Mathieu Othacehe Date: Thu, 16 Dec 2021 14:06:48 +0100 Message-Id: <20211216130649.30285-9-othacehe@gnu.org> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211216130649.30285-1-othacehe@gnu.org> References: <20211216130649.30285-1-othacehe@gnu.org> 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" X-getmail-retrieved-from-mailbox: Patches * guix/scripts/system.scm (system-derivation-for-action): Use the given image-size unconditionnaly when calling system-qemu-image/shared-store-script. --- guix/scripts/system.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm index a73fe55418..f7e17d2db4 100644 --- a/guix/scripts/system.scm +++ b/guix/scripts/system.scm @@ -710,10 +710,7 @@ (define* (system-derivation-for-action image action #:full-boot? full-boot? #:volatile? volatile? #:graphic? graphic? - #:disk-image-size - (if full-boot? - image-size - (* 70 (expt 2 20))) + #:disk-image-size image-size #:mappings mappings)) ((image disk-image vm-image docker-image) (when (eq? action 'disk-image)