aboutsummaryrefslogtreecommitdiff
path: root/release
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2021-03-04 13:39:43 +0000
committerGlen Barber <gjb@FreeBSD.org>2021-03-04 13:43:02 +0000
commitfa04db476201c4cad5f6a5f67da8f2ef1e1cdad3 (patch)
tree1e6d50b4c4950d21e346521738ced52940367c5f /release
parenta0d921bae9f3bcdb664f9737e20c0015123f11af (diff)
downloadsrc-fa04db476201c4cad5f6a5f67da8f2ef1e1cdad3.tar.gz
src-fa04db476201c4cad5f6a5f67da8f2ef1e1cdad3.zip
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")
Diffstat (limited to 'release')
-rw-r--r--release/Makefile.vm4
-rw-r--r--release/release.conf.sample4
-rw-r--r--release/tools/basic-ci.conf2
-rw-r--r--release/tools/ec2.conf2
-rw-r--r--release/tools/gce.conf2
-rw-r--r--release/tools/vagrant.conf2
6 files changed, 8 insertions, 8 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 <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
# 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.