git: fa04db476201 - main - release: fix VMSIZE following 1ca8842f3ad9

Nathan Whitehorn nwhitehorn at freebsd.org
Wed Apr 7 13:33:51 UTC 2021



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 <gjb at FreeBSD.org>
> AuthorDate: 2021-03-04 13:39:43 +0000
> Commit:     Glen Barber <gjb at FreeBSD.org>
> 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



More information about the dev-commits-src-all mailing list