From nobody Fri May 15 00:04:05 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 4gGnVY3rWgz5w4tn for ; Fri, 15 May 2026 00:04:05 +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 4gGnVY1sNjz3vNm for ; Fri, 15 May 2026 00:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778803445; 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=Ms2W2S1GM1Zi4ELEwgHo1Dhx9mT0+nNluoI6TUqwxz8=; b=UeLt9ciXUy6bLgVhlXG0tHfm8hZkjUgVBxaEj14GC1pf//SwBn+dUwlOHBF0XBtsSSQ65O JSmxMCmOM0kauBG+7mVHz1N8hkkpKU+1LnRm51Tdyga3QfSh+7xZcjAH1KxRKkSnDPf1eL 0epyzXrQKhhwyqwitGC4lObpemgX9CdnvWslIr2p8QUFybMRR9cYZifkerixJ52xekDWnJ yOIJdUCl4T3do4pbgkj5T674v5292iwtCoIxpXYP5JVQ8emQiARtLOcCHJhfnRpc44YKeF gpeFPvjKIhwTuIa+f3G7hoFg8qIqGd8dKKCOnLPULeVtfAJdl6SWaf303DPpOA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778803445; a=rsa-sha256; cv=none; b=PvBlJiZwsjWVE2Wwqi41XpnDkoQ3Fws4anXzTB86VgJPbILmrGcclrjJ1OaQv75FIrQKjA liaAFjJpptIfRpkGonhVhBGtZC2iUcbtcyobpfgUGHDaGfmwjRZhBazfken2KCY+PUnbq1 41Cj3rUuUpxF3xdON9R4hPItVjy5U7ZuZ+HuwKt0KXrVMuA9MZLlkJjYRojvIVvFlroMXJ gD5DI9jaB3Jy7xLdcEGctk0fhR3cKrVvAZd9HMeYz3/oBeSorzqPjfKw6HLa/hno1aORBZ ias3EHjKXSz+wf1Y4SGByNkpI23G5Qm8lpJ6zqIR1g6F2OUWR3Wx0uc6GZm1kg== 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=1778803445; 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=Ms2W2S1GM1Zi4ELEwgHo1Dhx9mT0+nNluoI6TUqwxz8=; b=vEF/670aMAXgXCbpcAHNMMSmKq6TqNmNIJrkQQN7oyl1eysjNMulqJXLl7rg9NiYsjKu/G 7VdWpwoTM86Sh/lgYBgarpGoyvHuT5rsRwneXpioKxVMNQH4w5avJwwOQoLFIYjxRA5+g6 +wg8sivJpxHbdeub3Gj7pu3Zu8pODaTX4Hi5h2NHbQo73PbRmNyC2FVlwxF2lnrCzcVh+F OBNPMZccbygMkVMi255FtVM99JUXR4IuV5JAVz58oIWXoMMTvi58I44gbd7475Nqi0ekLs KdCovQQvU94TN4jvnp77dIoDP9g9n19mIw4b09u1yFUn/shZsKBVoPqrzIQxwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGnVY1PmRz10Pw for ; Fri, 15 May 2026 00:04:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1e491 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 15 May 2026 00:04:05 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Colin Percival Subject: git: 73ec43ab702f - releng/15.1 - Cloud releases: More 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/releng/15.1 X-Git-Reftype: branch X-Git-Commit: 73ec43ab702fb06bf870af161919ad9423cddd19 Auto-Submitted: auto-generated Date: Fri, 15 May 2026 00:04:05 +0000 Message-Id: <6a0662f5.1e491.2b84b0ca@gitrepo.freebsd.org> The branch releng/15.1 has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=73ec43ab702fb06bf870af161919ad9423cddd19 commit 73ec43ab702fb06bf870af161919ad9423cddd19 Author: Colin Percival AuthorDate: 2026-05-14 21:14:09 +0000 Commit: Colin Percival CommitDate: 2026-05-15 00:03:49 +0000 Cloud releases: More firstboot_pkg_upgrade Update a couple more cloudware images which I forgot about earlier. Approved by: re (cperciva) Reviewed by: ziaee Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade") Differential Revision: https://reviews.freebsd.org/D57006 (cherry picked from commit 4080419d9a2d88d44d20baaf3ea01934561819c1) (cherry picked from commit 1ae97c95d025277fb542936b0a2686180dd4a7b7) --- release/tools/basic-cloudinit.conf | 7 ++++--- release/tools/ec2-small.conf | 9 ++++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/release/tools/basic-cloudinit.conf b/release/tools/basic-cloudinit.conf index 98e11f0bb08b..621165ea1669 100644 --- a/release/tools/basic-cloudinit.conf +++ b/release/tools/basic-cloudinit.conf @@ -8,16 +8,17 @@ export CONFIG_DRIVE=YES export CONFIG_DRIVE_SIZE=1M # Packages to install into the image we're creating. -# * firstboot-freebsd-update, to install security updates at first boot. -export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-freebsd-update" +# * firstboot-pkg-upgrade, to install security updates at first boot. +export VM_EXTRA_PACKAGES="${VM_EXTRA_PACKAGES} firstboot-pkg-upgrade" # Set to a list of third-party software to enable in rc.conf(5). -export VM_RC_LIST="${VM_RC_LIST} firstboot_freebsd_update growfs sshd nuageinit" +export VM_RC_LIST="${VM_RC_LIST} firstboot_pkg_upgrade growfs sshd nuageinit" vm_extra_pre_umount() { cat << EOF >> ${DESTDIR}/etc/rc.conf dumpdev="AUTO" ifconfig_DEFAULT="SYNCDHCP accept_rtadv" +firstboot_pkg_upgrade_repos="FreeBSD-base" # RSA host keys are obsolete and also very slow to generate sshd_rsa_enable="NO" EOF diff --git a/release/tools/ec2-small.conf b/release/tools/ec2-small.conf index 6564a59c2cf6..f5904d5ea4ba 100644 --- a/release/tools/ec2-small.conf +++ b/release/tools/ec2-small.conf @@ -25,18 +25,21 @@ vm_extra_filter_base_packages() { # Packages to install into the image we're creating. In addition to packages # present on all EC2 AMIs, we install: # * 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} 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() { + # 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.