From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uKpXNudR/2HpFAAAgWs5BA (envelope-from ) for ; Sun, 06 Feb 2022 05:43:19 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id WAozM+dR/2FewQAAauVa8A (envelope-from ) for ; Sun, 06 Feb 2022 05:43:19 +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 421841851E for ; Sun, 6 Feb 2022 05:43:19 +0100 (CET) Received: from localhost ([::1]:39722 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nGZOQ-0005qE-76 for larch@yhetil.org; Sat, 05 Feb 2022 23:43:18 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43194) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nGZOA-0005pv-Vr for bug-guix@gnu.org; Sat, 05 Feb 2022 23:43:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42241) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nGZOA-0000cr-MN for bug-guix@gnu.org; Sat, 05 Feb 2022 23:43:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nGZOA-0001F4-E3 for bug-guix@gnu.org; Sat, 05 Feb 2022 23:43:02 -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: Sun, 06 Feb 2022 04:43:02 +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.16441225684752 (code B ref 53194); Sun, 06 Feb 2022 04:43:02 +0000 Received: (at 53194) by debbugs.gnu.org; 6 Feb 2022 04:42:48 +0000 Received: from localhost ([127.0.0.1]:36137 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGZNv-0001EZ-P4 for submit@debbugs.gnu.org; Sat, 05 Feb 2022 23:42:48 -0500 Received: from mail-qk1-f171.google.com ([209.85.222.171]:43567) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nGZNt-0001EM-GW for 53194@debbugs.gnu.org; Sat, 05 Feb 2022 23:42:46 -0500 Received: by mail-qk1-f171.google.com with SMTP id j24so8308894qkk.10 for <53194@debbugs.gnu.org>; Sat, 05 Feb 2022 20:42:45 -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=XCi1HZtp925Vn1b1jX/75XI0calZbcnr2LXpX9fM4Lw=; b=GyLMAAIssWVqcB+OQdqHxjp9Stfti5eucrHzq01BghggBzIs6A5zdQJiMY6lsrBoX7 ivGFfhKfrSP82f81siXfd1N+B85Rg765oQqA2wL6/TIynsnvuDH5DCAAMDrBxIC7+7gM g+/M+HnACvlC0dwnLTEbPd+6h2gc+YqWQ3wXwaATH5BakgbE1Va4cNeTvyqcMHU68X0i R6u9Iu/Hu00O8wbKQ+72NBkM5JYqG5OLGq98nSponJdoDi3tLtp2RFUeJpqZ/zSZy5NH cf2XF4qWJPMyxwHbzah3neAuJO2KJKlvLYUI2YHiNy3dl8yqHfyzCgNOqGwG8UzrZ+0Z 2DXw== 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=XCi1HZtp925Vn1b1jX/75XI0calZbcnr2LXpX9fM4Lw=; b=O59oosr3nNFHtYUcAXvjuZWrbph0SQV8TEu8avmwBWBNAsGjnYYBHYnbVOGZMT3EQl RGmGe6aP9OcQ0HytieuZVxXHD52VqkPRw1JClMdOZ6/0BjN7zGsSVveDastMveBGwlyY Vw4gBx6jfeo+9zdRElOHCq/x0vDqdgsWntVpPxhhOR0vQ+CaCNwy6NRM76h12cpEqk65 1Vye8fNNcpnR2qimokFc0Aqu315HDMUyrGIPkI9x+dot78e2dRN7eHe0yW3getl9fGkr ryACFpOS9PAwHhM4sV9rwoS3rrKsYOyFX7YME8960/6Wwacw3DHmttycZt5ffVMmxcbX H1pA== X-Gm-Message-State: AOAM531EoMOxqNwrozDX3biM8SlaEA8a123x7h4M5KjQUbfJVBLqxqqP UWvBfPK3ZuYoyWp0o2Y2mWi3avdpWe4= X-Google-Smtp-Source: ABdhPJxvuQ+PBEmrlprQQaitals3kzHIfmkU29zBGm56wqW8fYUH+Gc++CaSnmuwlVWKJYj06W2YPQ== X-Received: by 2002:a37:5503:: with SMTP id j3mr3284731qkb.346.1644122559635; Sat, 05 Feb 2022 20:42:39 -0800 (PST) Received: from hurd (dsl-10-149-121.b2b2c.ca. [72.10.149.121]) by smtp.gmail.com with ESMTPSA id z19sm3990163qtj.77.2022.02.05.20.42.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Feb 2022 20:42:39 -0800 (PST) From: Maxim Cournoyer References: <874k6akqlx.fsf@nckx> <87r18v4s5x.fsf@gmail.com> Date: Sat, 05 Feb 2022 23:42:38 -0500 In-Reply-To: <87r18v4s5x.fsf@gmail.com> (Maxim Cournoyer's message of "Tue, 25 Jan 2022 12:54:50 -0500") Message-ID: <87fsow38sh.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=1644122599; 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=XCi1HZtp925Vn1b1jX/75XI0calZbcnr2LXpX9fM4Lw=; b=qCr2eCSkStNHA9iHmGX4K+xcEs6fajELUrhr/SdxeiD+E/0o7Eh/3gE+a4T21JV2DQJGGK B4B79/wkWmZ47JGFrzYGd21U7XqkA/QN0/XiaSQ0W8g/fZVZF4ZbPJEXU9a3GaQ5YdQG92 G6cubmKgE68BRaku3KLo78eYCtm4eBJw0tiUN3NO0vBZXWmT+KjpeH5Al2QYTFs3zltXm9 XCE/FDRSl96+WWPPMSrOAPc8CLvZgfZdWe9A+HgbheV5Te2NF9L3hRBPuSgLRdWbWfUdYU 7FLgazTE0FMlW9izS8ztlxdmeYxC1Ex3wR4pP+Iq9LBQ9z/0DurBGNZZyYLFmA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1644122599; a=rsa-sha256; cv=none; b=jgPcQ9P4nue3bHmjUfgkc+0GhJWj47GJbMQZ/96tiziwbkruelTBQ5XHpHGI6nf/Do/Uji e3S262tw1Gf+0+1y/Nuthb/VnKHvzh0afmsqYeHf+sdGo1xZj7w7IF1YUPZJ/WVccvCh9F KcgxJkx4jRR+XeSEkgZxpnK4SNLYLHkRNqEUHJGH/Ek6LpYx8Rsik8GcSrhjJUZWCXwY5h NqERypFpK++cq9Z4+dIn2svxXJG1OLsNDq+poABykBNQ/1JtJ/e19aKBtFcfL7YGgbFHFk L03r5X6XtSXGTyveFAij6wuaa2ORlk701zDxvGy6Zxkk9gXNV9lE7mqnAdeBJg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=GyLMAAIs; 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.03 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=GyLMAAIs; 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: 421841851E X-Spam-Score: -2.03 X-Migadu-Scanner: scn1.migadu.com X-TUID: QEtfCjlSHwvM Hello, Maxim Cournoyer writes: > 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 doe= sn'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 t= his in >> +turn doesn't take any constant overhead into account, force a 1-MiB min= imum." >> + (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: > > (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)) > > in guix/build/store-copy.scm. FYI, I pushed this workaround in 3c3c9d259f87fbc8c1d9551af32e79f9f168f596. Thanks, Maxim