From nobody Thu May 14 22:38:43 2026 X-Original-To: dev-commits-src-all@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 4gGlc8716Rz5vwwq for ; Thu, 14 May 2026 22:38:48 +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 "R13" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gGlc85D0Pz3dGd for ; Thu, 14 May 2026 22:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778798328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/xYAuUwwM1U2OtI7Hk7YVORpKOXkkj1BAxp+lINC0A=; b=RKNYdiv4OcpKHelzTuR63sRVzbwNsPm/5thULp1W+KVz0VJi9gUKhfyGV4JC76fIn4Rl9m g17/seElBY4dNurCKUzY+xoFKHODe1g62zDrGZTXwucG75onSQjRQOzWsgG3/6R230jVNT EX6JAWUCBnDP3LNX4wFsNMf1n4jMzrH8qxJDrluST5Iy8aGIEuzcmDBTDLO+md1wHgn9RP bTD+bKwev2u0KG4IhLagYBGdtcIhSuHTtKysorlXgfbAn+z/WADNYJx+gG6hMusfrNMOGY rMR0LPCfmcXiZ2ATMJXd50EcXiM/4/vEVTIQ1YkEdFosgDmNxWZI+5l9AWlU9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778798328; a=rsa-sha256; cv=none; b=vHR6IHrkyyIixOt1DvZnFPeNbGVkeBpHqrDvu8uw98LztpdusjZiQd+h49zrmevntC3U8k ill0iAPmgjn53aNt7mX5/1ScbB6ONhxo++9MwNn/Khnit/uQD6uBqBhNy5/vT4do5vgt1A UyvY7UnTd2Fz0XjHKWcWcO6kxapkn1nWhWEepGhsKTjY+mEbCs7RJbZ6vEoIwPVziQs+dx vM8H431FclDCS/bKolmzk3q2rQx9yqWajw7Y42SAMNMwnhE9nqWCAEnRGMgxsl8et5+0Wh loKC0MJLpDOVvyWczs4ga2Gy9A6ph1d3YyTrFBlrkUh+9Sw6j0uIVhOAiyNeCA== 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=1778798328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p/xYAuUwwM1U2OtI7Hk7YVORpKOXkkj1BAxp+lINC0A=; b=B5dZTDpHPyySLctc3DD60LAjexV5WbT4FBRPwB7tkUdggfwN9Ku3bfwBpJM1Xr3WLDJC0F P+FEaVJwq66LTRd6n41yH5aSaWLHxGyN2SmDycvEefFLeaZDbZl0q4+2YpaulASGU2n+93 VAfyW01/PNerKcS9MAGB/ue868UIJZoG1tlj/Yg15yUxCD72Yz5og8qLKkjJEr7VYO+6k2 WfavJt8+NAr5H+OPqrMgjAcUt7mExxnby584PXCNf3fMh67HXKP/fY+0LwLi2jZKYeGtCf 1FQZbYiac0l992YFx5N18HIHJ2OGuwtMxy4jFwEeBefruFcpUwivDQEVg6zmHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGlc84mGyzwdt for ; Thu, 14 May 2026 22:38:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 4455f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 22:38:43 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Alexander Ziaee From: Colin Percival Subject: git: 0bb2b2a45f3c - stable/15 - Cloud releases: Switch to firstboot_pkg_upgrade List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 0bb2b2a45f3c0c147d7c55e010be45e55af8df87 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 22:38:43 +0000 Message-Id: <6a064ef3.4455f.62432907@gitrepo.freebsd.org> The branch stable/15 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=0bb2b2a45f3c0c147d7c55e010be45e55af8df87 commit 0bb2b2a45f3c0c147d7c55e010be45e55af8df87 Author: Alexander Ziaee AuthorDate: 2026-05-14 21:05:07 +0000 Commit: Colin Percival CommitDate: 2026-05-14 22:38:12 +0000 Cloud releases: Switch to firstboot_pkg_upgrade Cloud images are deployed with base system packages. Introduce a firstboot package auto updater to patch the base system on first boot. MFC after: 1 hour MFC to: stable/15 Reviewed by: cperciva Sponsored by: Google Cloud Differential Revision: https://reviews.freebsd.org/D56890 (cherry picked from commit 464a351267dc0d1843b919dd72ad1c70c24815ce) --- release/tools/azure.conf | 5 +++-- release/tools/ec2-base.conf | 9 ++++++--- release/tools/gce.conf | 5 +++-- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/release/tools/azure.conf b/release/tools/azure.conf index 7a4f0b5027cf..9a5c12424bd3 100644 --- a/release/tools/azure.conf +++ b/release/tools/azure.conf @@ -6,10 +6,10 @@ export VMSIZE=30g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-freebsd-update firstboot-pkgs" +export VM_EXTRA_PACKAGES="azure-agent python python3 firstboot-pkg-upgrade firstboot-pkgs" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="ntpd sshd waagent firstboot_freebsd_update firstboot_pkgs" +export VM_RC_LIST="ntpd sshd waagent firstboot_pkg_upgrade firstboot_pkgs" # No swap space; waagent will allocate swap space on the resource disk. # See ResourceDisk.EnableSwap and ResourceDisk.SwapSizeMB in waagent.conf @@ -43,6 +43,7 @@ vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf ifconfig_hn0="SYNCDHCP" ntpd_sync_on_start="YES" +firstboot_pkg_upgrade_repos="FreeBSD-base" EOF cat << EOF >> ${DESTDIR}/boot/loader.conf diff --git a/release/tools/ec2-base.conf b/release/tools/ec2-base.conf index ffe2646240a5..24b2feb5f0d7 100644 --- a/release/tools/ec2-base.conf +++ b/release/tools/ec2-base.conf @@ -7,15 +7,15 @@ # * amazon-ssm-agent (not enabled by default, but some users need to use # it on systems not connected to the internet), # * ec2-scripts, which provides a range of EC2ification startup scripts, -# * firstboot-freebsd-update, to install security updates at first boot, +# * firstboot-pkg-upgrade, to install security updates at first boot, # * firstboot-pkgs, to install packages at first boot, and # * isc-dhcp44-client, used for IPv6 network setup. export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} amazon-ssm-agent ec2-scripts \ - firstboot-freebsd-update firstboot-pkgs isc-dhcp44-client" + firstboot-pkg-upgrade firstboot-pkgs isc-dhcp44-client" # Services to enable in rc.conf(5). export VM_RC_LIST="${VM_RC_LIST} ec2_configinit ec2_ephemeral_swap \ - ec2_fetchkey ec2_loghostkey firstboot_freebsd_update firstboot_pkgs \ + ec2_fetchkey ec2_loghostkey firstboot_pkg_upgrade firstboot_pkgs \ growfs sshd" vm_extra_pre_umount() { @@ -24,6 +24,9 @@ vm_extra_pre_umount() { # via EC2 user-data. echo 'firstboot_pkgs_list="devel/py-awscli"' >> ${DESTDIR}/etc/rc.conf + # Limit firstboot_pkg_upgrade to the base system. + echo 'firstboot_pkg_upgrade_repos="FreeBSD-base"' >> ${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/gce.conf b/release/tools/gce.conf index 7298aabf3956..938672ac92e0 100644 --- a/release/tools/gce.conf +++ b/release/tools/gce.conf @@ -6,14 +6,14 @@ export VMSIZE=20g # Set to a list of packages to install. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update \ +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade \ firstboot-pkgs google-cloud-sdk panicmail sudo \ sysutils/py-google-compute-engine lang/python \ lang/python3" # Set to a list of third-party software to enable in rc.conf(5). export VM_RC_LIST="ntpd sshd growfs \ - firstboot_pkgs firstboot_freebsd_update google_startup \ + firstboot_pkgs firstboot_pkg_upgrade google_startup \ google_accounts_daemon google_clock_skew_daemon \ google_instance_setup google_network_daemon" @@ -47,6 +47,7 @@ ifconfig_DEFAULT="SYNCDHCP mtu 1460" ntpd_sync_on_start="YES" # need to fill in something here #firstboot_pkgs_list="" +firstboot_pkg_upgrade_repos="FreeBSD-base" panicmail_autosubmit="YES" EOF