From owner-dev-commits-src-all@freebsd.org Wed Apr 7 13:33:51 2021 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 374205D771E; Wed, 7 Apr 2021 13:33:51 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFljC16Prz3LTw; Wed, 7 Apr 2021 13:33:51 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from comporellon.tachypleus.net (unknown [IPv6:2601:405:4a00:acd:143b:69ef:22c2:14cb]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client did not present a certificate) (Authenticated sender: nwhitehorn/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id DFDCD280C5; Wed, 7 Apr 2021 13:33:50 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Subject: Re: git: fa04db476201 - main - release: fix VMSIZE following 1ca8842f3ad9 To: Glen Barber , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202103041343.124Dh6cq038222@gitrepo.freebsd.org> From: Nathan Whitehorn Message-ID: <5c7bf986-d5ee-3544-91d1-84a502d7bdbb@freebsd.org> Date: Wed, 7 Apr 2021 09:33:50 -0400 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.9.0 MIME-Version: 1.0 In-Reply-To: <202103041343.124Dh6cq038222@gitrepo.freebsd.org> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 13:33:51 -0000 On 3/4/21 8:43 AM, Glen Barber wrote: > The branch main has been updated by gjb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=fa04db476201c4cad5f6a5f67da8f2ef1e1cdad3 > > commit fa04db476201c4cad5f6a5f67da8f2ef1e1cdad3 > Author: Glen Barber > AuthorDate: 2021-03-04 13:39:43 +0000 > Commit: Glen Barber > CommitDate: 2021-03-04 13:43:02 +0000 > > release: fix VMSIZE following 1ca8842f3ad9 > > truncate(1) is not case-sensitive with regard to setting the size > of a file. makefs(8), however, does not honor upper-case values. > Update release-specific files and the release(7) manual page to > reflect this. [...] Should we also either lower-case everything when passed to makefs in vmimage.subr or modify makefs to take upper-case values? Everything else in our system is case-agnostic. -Nathan > > MFC with: 1ca8842f3ad9 > Submitted by: ehem_freebsd_m5p.com (original) > Differential Review: https://reviews.freebsd.org/D28979 > Sponsored by: Rubicon Communications, LLC ("Netgate") > --- > release/Makefile.vm | 4 ++-- > release/release.conf.sample | 4 ++-- > release/tools/basic-ci.conf | 2 +- > release/tools/ec2.conf | 2 +- > release/tools/gce.conf | 2 +- > release/tools/vagrant.conf | 2 +- > share/man/man7/release.7 | 6 +++--- > 7 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/release/Makefile.vm b/release/Makefile.vm > index d075fa1fb29c..2240a1e5fc57 100644 > --- a/release/Makefile.vm > +++ b/release/Makefile.vm > @@ -7,8 +7,8 @@ > > VMTARGETS= vm-image > VMFORMATS?= vhd vmdk qcow2 raw > -VMSIZE?= 4096M > -SWAPSIZE?= 1G > +VMSIZE?= 4096m > +SWAPSIZE?= 1g > VMBASE?= vm