From owner-dev-commits-src-all@freebsd.org Thu Mar 4 13:43:07 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 1B25254A0CB; Thu, 4 Mar 2021 13:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DrsWb0J6Mz3mMZ; Thu, 4 Mar 2021 13:43:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F143F1E05A; Thu, 4 Mar 2021 13:43:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 124Dh64j038223; Thu, 4 Mar 2021 13:43:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 124Dh6cq038222; Thu, 4 Mar 2021 13:43:06 GMT (envelope-from git) Date: Thu, 4 Mar 2021 13:43:06 GMT Message-Id: <202103041343.124Dh6cq038222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: fa04db476201 - main - release: fix VMSIZE following 1ca8842f3ad9 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa04db476201c4cad5f6a5f67da8f2ef1e1cdad3 Auto-Submitted: auto-generated 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: Thu, 04 Mar 2021 13:43:07 -0000 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. 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 VHD_DESC= Azure, VirtualPC, Hyper-V, Xen disk image diff --git a/release/release.conf.sample b/release/release.conf.sample index 4de068750228..bd7be15b0227 100644 --- a/release/release.conf.sample +++ b/release/release.conf.sample @@ -99,8 +99,8 @@ PORTBRANCH="main" ## If WITH_VMIMAGES is set to a non-empty value, this is the size of the ## virtual machine disk filesystem. Valid size values are described in -## the truncate(1) manual page. -#VMSIZE="20G" +## the makefs(8) manual page. +#VMSIZE="20g" ## If WITH_VMIMAGES is set to a non-empty value, this is a list of disk ## image formats to create. Valid values are listed in the mkimg(1) diff --git a/release/tools/basic-ci.conf b/release/tools/basic-ci.conf index 19bb2454f78d..9dc05c57d0f4 100644 --- a/release/tools/basic-ci.conf +++ b/release/tools/basic-ci.conf @@ -4,7 +4,7 @@ # # Should be enough for base image, image can be resized in needed -export VMSIZE=5G +export VMSIZE=5g # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="sshd growfs" diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index e726ccadc048..bfda9052421f 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -24,7 +24,7 @@ export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_loghostkey firstboot_freebsd_ # Note that if this is set to G, we will end up with an GB disk # image since VMSIZE is the size of the UFS partition, not the disk which # it resides within. -export VMSIZE=5000M +export VMSIZE=5000m # No swap space; the ec2_ephemeralswap rc.d script will allocate swap # space on EC2 ephemeral disks. (If they exist -- the T2 low-cost instances diff --git a/release/tools/gce.conf b/release/tools/gce.conf index f156a5bb93eb..113784a7643e 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -4,7 +4,7 @@ # # The default of 3GB is too small for GCE, so override the size here. -export VMSIZE=20G +export VMSIZE=20g # Set to a list of packages to install. export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index c683cf7a07d2..05e7052d46c4 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -4,7 +4,7 @@ # # The default of 3GB is too small for Vagrant, so override the size here. -export VMSIZE=8G +export VMSIZE=8g # Packages to install into the image we're creating. This is a deliberately # minimalist set, providing only the packages necessary to bootstrap. diff --git a/share/man/man7/release.7 b/share/man/man7/release.7 index 82c1b83fe3a4..a474de83ec93 100644 --- a/share/man/man7/release.7 +++ b/share/man/man7/release.7 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 2, 2021 +.Dd March 4, 2021 .Dt RELEASE 7 .Os .Sh NAME @@ -360,9 +360,9 @@ The default value is .It Va VMSIZE Set to change the size of the virtual machine disk capacity. The default value is -.Va 20G . +.Va 20g . See -.Xr truncate 1 +.Xr makefs 8 for valid values. .Pp Virtual machine disk images are, by default, created as sparse images.