From nobody Mon Aug 24 05:08:10 2026 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4hSzSq0pFYz6qFn7 for ; Mon, 24 Aug 2026 05:08:11 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hSzSp6gkxz3bTG for ; Mon, 24 Aug 2026 05:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787548090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8I1oDN4PjkPN8GgveybnPCATE3BFJc45dHCIiLNXAEU=; b=KlZVtgstfTUz3JT3CBDz3ADNtwCYxuAt5L9+0houY7sqgBz8GTLNIcQQITezHK0sGtAdta PgnEJXHtW67OxeLiSYN5hJiaMY6YUrZ0BMHjeaGlzLco9gJaal3R6pF7YtWSx+koeJmRpv KtB2gKeBaY+uB44M3e0gQo7lR8uprZ1WLBpWw1NlBaVpmfHQ5M+Kkp6SfyYxgiuSe+aCGm eZ1eMLnpIjWIKXOLlgeyMD9LOG/lZh9fUv782L5BMs2OQHb9kRAafKgAeCqofs6qOhFmo8 3JHCuqbzedR/obTA7x9pyY1KT3aAMrHs5SicJge5ptiDo6fRJJXFKPaeGCt5zg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787548090; a=rsa-sha256; cv=none; b=CXFe0leM6D8+l7De6wyECkKg2IvYGDAa7bJNwwxCwa5Zk5POmHqOkaCxWjT/CJ9dvOwcdQ RzTWOl3ymrW8qqk/lbyH+uC8/SdRFRcnxzn2NrFk6dEwGwXaUo+L8qGiWn4kN4hpm4kuCU 4o0nxp7S+64NYN0HuTTaNBIQaXvlQmSCUOqt6nJx012AAyGmXYLtEFm2bala6wIp7l0v7X fxnxI28OXCJNOTDrSLnYAL1lH4UJm/cVH8K8Qnqaxe+ACKoicBayrFGfKKl4OVVF1mfvaQ ET+Paz+lGd0X0GUG1AbNDOP1I3y7XeWT5w9yjDs6z//FIqm4DjGL/rIUPGykkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787548090; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8I1oDN4PjkPN8GgveybnPCATE3BFJc45dHCIiLNXAEU=; b=c3YYMArd/+eTRdL8ZWVItTbtTcOMoKW4tiKbGNTn6+xcZfzN1lfS+kgEG2SRffMul0+a5J mm1IdymqgLOb7tvsz3MMwK+vo7/ZXewK2wgKeYAD8dgaAhfOiIq4T8S7sfcgEua/liItEE IA1UTWIfx6GiWrn4SfUXFjYEgcJZnagxt10vWEf0m8hdINfUmjOGsdyta8wKo2/J5rLssR fDeWkFHP3j8LwXXgnBaDaiVpWQsH5xrcMMsCQA62bRNTk4clp7ke1Wr4GCMmIA1rNqtZZ+ jhhdA5aoDjeyUSGv3YGu/AFjMsVsT+gCTfkKAo/bdnHwYTlG8OOCe+6UUTslmw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hSzSp5HNczqQM for ; Mon, 24 Aug 2026 05:08:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 255c6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 24 Aug 2026 05:08:10 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 22c4099b047f - main - EC2: Enable autogrowing filesystems post-boot List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22c4099b047f33d23266c7fbf545c7ae85f183ba Auto-Submitted: auto-generated Date: Mon, 24 Aug 2026 05:08:10 +0000 Message-Id: <6a8bd1ba.255c6.274ec1dd@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=22c4099b047f33d23266c7fbf545c7ae85f183ba commit 22c4099b047f33d23266c7fbf545c7ae85f183ba Author: Colin Percival AuthorDate: 2026-08-24 05:06:06 +0000 Commit: Colin Percival CommitDate: 2026-08-24 05:06:06 +0000 EC2: Enable autogrowing filesystems post-boot Enable the new growfs_postboot mechanism. Note that this also implies disabling automatic allocation of swap space on the root disk, since we cannot grow the root filesystem if swap space is allocated after it. This will not be MFCed since it is a significant behavioural change. Sponsored by: Amazon Relnotes: yes --- release/tools/ec2-base.conf | 6 +++++- release/tools/ec2-small.conf | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index 24b2feb5f0d7..bbee8a961cae 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -16,7 +16,7 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \ # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ - growfs sshd" + growfs growfs_postboot sshd" vm_extra_pre_umount() { # The AWS CLI tools are generally useful, and small enough that they @@ -27,6 +27,10 @@ vm_extra_pre_umount() { # Limit firstboot_pkg_upgrade to the base system. echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Don't allocate swap space when we first boot; that makes it + # impossible to grow the root filesystem later. + echo 'growfs_swap_size=0' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already. diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 6da4444bc835..30992d70b24f 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -34,12 +34,16 @@ export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} ec2-scripts \ # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade \ - growfs sshd" + growfs growfs_postboot sshd" vm_extra_pre_umount() { # Limit firstboot_pkg_upgrade to the base system. echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${DESTDIR}/etc/rc.conf + # Don't allocate swap space when we first boot; that makes it + # impossible to grow the root filesystem later. + echo 'growfs_swap_size=0' >> ${DESTDIR}/etc/rc.conf + # Any EC2 ephemeral disks seen when the system first boots will # be "new" disks; there is no "previous boot" when they might have # been seen and used already.