KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

release: fix VMSIZE following 1ca8842f3a

Browse Source 
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:	1ca8842f3a
Submitted by:	ehem_freebsd_m5p.com (original)
Differential Review:	https://reviews.freebsd.org/D28979
Sponsored by:	Rubicon Communications, LLC ("Netgate")
This commit is contained in:
Glen Barber
2021-03-04 08:39:43 -05:00
parent a0d921bae9
commit fa04db4762
7 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
release/Makefile.vm
+2 -2
View File
@@ -7,8 +7,8 @@
VMTARGETS= vm-image VMTARGETS= vm-image
VMFORMATS?= vhd vmdk qcow2 raw VMFORMATS?= vhd vmdk qcow2 raw
VMSIZE?= 4096M VMSIZE?= 4096m
SWAPSIZE?= 1G SWAPSIZE?= 1g
VMBASE?= vm VMBASE?= vm
VHD_DESC= Azure, VirtualPC, Hyper-V, Xen disk image VHD_DESC= Azure, VirtualPC, Hyper-V, Xen disk image
release/release.conf.sample
+2 -2
View File
@@ -99,8 +99,8 @@ PORTBRANCH="main"
## If WITH_VMIMAGES is set to a non-empty value, this is the size of the ## 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 ## virtual machine disk filesystem. Valid size values are described in
## the truncate(1) manual page. ## the makefs(8) manual page.
#VMSIZE="20G" #VMSIZE="20g"
## If WITH_VMIMAGES is set to a non-empty value, this is a list of disk ## 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) ## image formats to create. Valid values are listed in the mkimg(1)
release/tools/basic-ci.conf
+1 -1
View File
@@ -4,7 +4,7 @@
# #
# Should be enough for base image, image can be resized in needed # 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). # Set to a list of third-party software to enable in rc.conf(5).
export VM_RC_LIST="sshd growfs" export VM_RC_LIST="sshd growfs"
release/tools/ec2.conf
+1 -1
View File
@@ -24,7 +24,7 @@ export VM_RC_LIST="ec2_configinit ec2_fetchkey ec2_loghostkey firstboot_freebsd_
# Note that if this is set to <N>G, we will end up with an <N+1> GB disk # Note that if this is set to <N>G, we will end up with an <N+1> GB disk
# image since VMSIZE is the size of the UFS partition, not the disk which # image since VMSIZE is the size of the UFS partition, not the disk which
# it resides within. # it resides within.
export VMSIZE=5000M export VMSIZE=5000m
# No swap space; the ec2_ephemeralswap rc.d script will allocate swap # 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 # space on EC2 ephemeral disks. (If they exist -- the T2 low-cost instances
release/tools/gce.conf
+1 -1
View File
@@ -4,7 +4,7 @@
# #
# The default of 3GB is too small for GCE, so override the size here. # 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. # Set to a list of packages to install.
export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \ export VM_EXTRA_PACKAGES="firstboot-freebsd-update firstboot-pkgs \
release/tools/vagrant.conf
+1 -1
View File
@@ -4,7 +4,7 @@
# #
# The default of 3GB is too small for Vagrant, so override the size here. # 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 # Packages to install into the image we're creating. This is a deliberately
# minimalist set, providing only the packages necessary to bootstrap. # minimalist set, providing only the packages necessary to bootstrap.
share/man/man7/release.7
+3 -3
View File
@@ -24,7 +24,7 @@
.\" .\"
.\" $FreeBSD$ .\" $FreeBSD$
.\" .\"
.Dd March 2, 2021 .Dd March 4, 2021
.Dt RELEASE 7 .Dt RELEASE 7
.Os .Os
.Sh NAME .Sh NAME
@@ -360,9 +360,9 @@ The default value is
.It Va VMSIZE .It Va VMSIZE
Set to change the size of the virtual machine disk capacity. Set to change the size of the virtual machine disk capacity.
The default value is The default value is
.Va 20G . .Va 20g .
See See
.Xr truncate 1 .Xr makefs 8
for valid values. for valid values.
.Pp .Pp
Virtual machine disk images are, by default, created as sparse images. Virtual machine disk images are, by default, created as sparse images.