From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id SAccIcc58GGNXgAAgWs5BA (envelope-from ) for ; Tue, 25 Jan 2022 18:56:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wAutHcc58GGEgAAAauVa8A (envelope-from ) for ; Tue, 25 Jan 2022 18:56:23 +0100 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 12D189D4B for ; Tue, 25 Jan 2022 18:56:23 +0100 (CET) Received: from localhost ([::1]:50874 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nCQ3K-0005p5-7j for larch@yhetil.org; Tue, 25 Jan 2022 12:56:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:55736) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nCQ30-0005CS-A4 for bug-guix@gnu.org; Tue, 25 Jan 2022 12:56:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:57074) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nCQ2z-0003Zr-TT for bug-guix@gnu.org; Tue, 25 Jan 2022 12:56:01 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nCQ2z-0002mn-Os for bug-guix@gnu.org; Tue, 25 Jan 2022 12:56:01 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#53194: System test partition.img differs in size across hosts(?) Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Tue, 25 Jan 2022 17:56:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53194 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: Tobias Geerinckx-Rice Received: via spool by 53194-submit@debbugs.gnu.org id=B53194.164313331410647 (code B ref 53194); Tue, 25 Jan 2022 17:56:01 +0000 Received: (at 53194) by debbugs.gnu.org; 25 Jan 2022 17:55:14 +0000 Received: from localhost ([127.0.0.1]:49977 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCQ2E-0002lf-7i for submit@debbugs.gnu.org; Tue, 25 Jan 2022 12:55:14 -0500 Received: from mail-qv1-f53.google.com ([209.85.219.53]:41665) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nCQ29-0002lK-PL for 53194@debbugs.gnu.org; Tue, 25 Jan 2022 12:55:13 -0500 Received: by mail-qv1-f53.google.com with SMTP id hu2so26052558qvb.8 for <53194@debbugs.gnu.org>; Tue, 25 Jan 2022 09:55:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-transfer-encoding; bh=yOMrEZklkgCXlqGQt8M4w+lQUPq1lYL8apdxQpVyxA8=; b=X3qXDRFRDM5+fkYhZoVIlkfj+ot6j9B0rGUR7RVHx16dTs8nsQO4VUcEW+8nHv+zyG JxVufnGOL7SKvmH4CsVsN5H4hgign6uQtMAkAKmleWclxcuAOmGbVoSeDWI1eIdRXCi2 byEVZTSweBMP0n5zdwcUy34/Uqca33WTzt8914u09kBiOpGvV1W7OmmREFqftV1hWM0R 6219msXMQVnyWYccoAcYyABDhwgGVdlG//cF5Yk54hIPG6n+WU+P3yL4jfy9rD8LdjK8 znQuD8pyRRJupXK3ytYtjXRpP/05s0lTlKWMeJUftTtH+MIzQChOc3Ji1hZspGLsamyq Auuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version:content-transfer-encoding; bh=yOMrEZklkgCXlqGQt8M4w+lQUPq1lYL8apdxQpVyxA8=; b=GNv36+C/JD4HxAZmQLYTiPHE0cdcKLfoC70po14fYmqoU4joQpIK4wExoNrTSQSBvp ZopP/jFffb4meje3XZihDqNZhlWeiIxFIQDBwDOLQa4fN/xDeGshVbFAC3oajB38t3wW H3mRFRzuD4Fd2/qHoX3rfuWb1yd31pgmsOfVP8MgmOzGKG7isDSPwdFpU+LGhgyNF1pa lmXywZJ7IBWpae8y6/dYDygPVACyx6HU4PTEtcE9KLwwysQ20z1AmidZ4WKGFkUvSSit drtfosg2bGxFvUJ8mMQTaNBaTAKvlYOkC0ifHrAJBzD0moGdFKI8hgQBdp88rFhSuF3c qrPg== X-Gm-Message-State: AOAM531/eJmyG7KFa4RL7Ud5lLtGE/b3ylaWQ6QIrr8NXxC4wOXzA7wV rUVeR2dwzif/+NXu07PcPD/lKDhBbEY= X-Google-Smtp-Source: ABdhPJzKWS5YtMOlEJQLWHak2/JaqSevJWhiDEWOmPU+mbvarInHU3XklmxZBWDENhM4YnzlErJElQ== X-Received: by 2002:a05:6214:2307:: with SMTP id gc7mr20391792qvb.7.1643133303803; Tue, 25 Jan 2022 09:55:03 -0800 (PST) Received: from hurd (dsl-10-136-58.b2b2c.ca. [72.10.136.58]) by smtp.gmail.com with ESMTPSA id e15sm8636391qtp.48.2022.01.25.09.55.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Jan 2022 09:55:03 -0800 (PST) From: Maxim Cournoyer References: <874k6akqlx.fsf@nckx> Date: Tue, 25 Jan 2022 12:54:50 -0500 In-Reply-To: <874k6akqlx.fsf@nckx> (Tobias Geerinckx-Rice's message of "Tue, 11 Jan 2022 20:31:27 +0100") Message-ID: <87r18v4s5x.fsf@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: 53194@debbugs.gnu.org Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" 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=1643133383; h=from:from:sender:sender: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=yOMrEZklkgCXlqGQt8M4w+lQUPq1lYL8apdxQpVyxA8=; b=plqsDxYlVYF1o71RbS/3V3Ka2uZs8znboKI8/0k2CpX/xjZLPkwq0t+UB3IC9gMvJ+kiBY mUGAY5GmCo2gUITNZvhFb/UjOvOOPGHqXfP9vx3QjpI50/OI36PhVogFgpunJH4Somw1CU rkZ2Sy8Y2XmsMXxuVIy5lQoWNekkM/yKDafr3WoVbhII3buERStalNVvoxLakuCluOHK0C Ydd+aKrAdlxWyYEzotbWPTKKToI6rY9qF1vm71rGqSVPE7aa121DqC+x+qZFmR2xa4Q77W Kp+4Q+hHwgymWopYTiE5Xb7ztvZvwieiyTBcFRZeO1SvsP5uK/GMHcRqv7TxQQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643133383; a=rsa-sha256; cv=none; b=ap5lQmDr3fMDNLjMNBw5OLVxIa5VMRUi+NwOGw+EgqpW1gfITDPNxeAxPWgQSD7SRI5WZN 3dhykmAMjNFtZ6HumvN2aOVm1IAXAu8gtGpN0LgInJZOCh9ADT0h4BWPfqauUJ0xey2Kd3 Pdx4/oXVEO7hr2zLqnXv9LBtJzwwZcl7PMoAhx/YyY8Cvoti/bBZFFBsGeM3DXb+tNYuFn gClpZfST+weJEW8gTRxo023IKDPc8mRwBPouz7KXIQkdg9+oJEz3nLEb0DF0WnuUvlAnPS 3n6l1rhBIr0/1kFs3GY0yaLtFrgV5OaBpC/gtpUypNbdCEoIXxHBhklFdiB2Rw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=X3qXDRFR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=X3qXDRFR; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 12D189D4B X-Spam-Score: -2.53 X-Migadu-Scanner: scn0.migadu.com X-TUID: w0c28hsiZzq9 Hi Tobias, [...] > diff --git a/gnu/build/image.scm b/gnu/build/image.scm > index bdd5ec25a9..81caa424f8 100644 > --- a/gnu/build/image.scm > +++ b/gnu/build/image.scm > @@ -3,7 +3,7 @@ > ;;; Copyright =C2=A9 2016 Christine Lemmer-Webber > ;;; Copyright =C2=A9 2016, 2017 Leo Famulari > ;;; Copyright =C2=A9 2017 Marius Bakke > -;;; Copyright =C2=A9 2020 Tobias Geerinckx-Rice > +;;; Copyright =C2=A9 2020, 2022 Tobias Geerinckx-Rice > ;;; Copyright =C2=A9 2020 Mathieu Othacehe > ;;; > ;;; This file is part of GNU Guix. > @@ -62,8 +62,10 @@ (define (size-in-kib size) >=20=20 > (define (estimate-partition-size root) > "Given the ROOT directory, evaluate and return its size. As this does= n't > -take the partition metadata size into account, take a 25% margin." > - (* 1.25 (file-size root))) > +take the partition metadata size into account, take a 25% margin. As th= is in > +turn doesn't take any constant overhead into account, force a 1-MiB mini= mum." > + (max (ash 1 20) > + (* 1.25 (file-size root)))) >=20=20 > (define* (make-ext-image partition target root > #:key Looks reasonable to me (although it is interesting that the behavior is not the same across machines...). While at it, you may want to fix this docstring: --8<---------------cut here---------------start------------->8--- (define (file-size file) - "Return the size of bytes of FILE, entering it if FILE is a directory." + "Return the size in bytes of FILE, entering it if FILE is a directory." (file-system-fold (const #t) (lambda (file stat result) ;leaf (+ (stat:size stat) result)) --8<---------------cut here---------------end--------------->8--- in guix/build/store-copy.scm. Thanks! Maxim