From nobody Thu May 14 21:59:48 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 4gGklF4bpWz5vt54 for ; Thu, 14 May 2026 21:59:53 +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 4gGklF3r9Nz3Whk for ; Thu, 14 May 2026 21:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1778795993; 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=3sFrKT+NmZsZqr601HMUze46ZOzdjnPRhFmaH+ogAck=; b=GP2+W/CYFbft7pfFpdLj78eNzf+6DBNBum0Do2FZrcxvfQxwrDLKKJ8RaP8jVmUTDDDXCv bknw/GvnJbHUd033YifFj5g40BhV1RMTAXd8eT/BAdpTTYiqbYDm3obtzH7Ioj1fw/QK19 EiOOupomLDBCX5NIKuh6MHHP0zMqsdM0NeQ1oUjMKJYar0lqjruLBkbJUeiTUJybNASxXl j4+X6Ds31Mj9z/BWzZChInpj+xFrO2BmsasFjosmB+IPFm9FGTtgCUJU4rNRfRBYQjHQf0 bae6R8uZG875rBgK85ed80IQDIyOxKY3vYN/5iciq7ZHHT6uKtJSIhcMH63+DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1778795993; a=rsa-sha256; cv=none; b=crywUupqMlULiiVled8ZU4IfkUJENa6to3PvUStlwSSC9X+WZqssu82ozmSEES1iNI8C40 qpo5XTnWlJxYxY+g/YGm1YEKJqfTddTWpqq+fcQcBDWoxVVoFr0EE2fJfet7p74DETGJfI B6ag1ExDjVd7bOVBGGgnBgPDzL+RbOBi+Tafg6dRJEMvqKgXJc1FRNapXqIXq/5X64lKu6 oeCIlt+suSnc0zN2gLu75buXFdd+tZO61Khfs1kUYhEzPVgcamEUb8vYejMFRE4yGHUCoF 7a3DiiCQoLF6tmQFI8wznOGBcrc3+OKASa+gOi3ehZv3L/xPsnRRBztGiugpeA== 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=1778795993; 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=3sFrKT+NmZsZqr601HMUze46ZOzdjnPRhFmaH+ogAck=; b=ZPYVlbryrlY2oZhjOy06QeJzCxiBsaWl56E3ADExB2+K6ESwrthXzkYJO8vbx7lfGiDhih Kjzxz0KkqbJ3q95ooCLkPGTHU+cB6WrQpps5I6PEsVEHScxSSkkFFsWrrGUqitrcM+2y1t erneKIpvY+/GZ0I1mC9zePaXPdqSzNCXK+Ctsd3eR6UXbtnfzgNVJqYpymIcCEs0+ihBRq BHE+zMcwdvM1VI2Rdj6VDBiSdq5Y0PjOc03fwN7IdlHf3AkjIYSThuUllqZgpxsbLkjaA3 iIj6y3cVWdQQqZv7gcSGsaUJiwvLL3aP4S4KCngUmeEVAoYMYQo47teQq0e80A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gGklF3Ns2zvq6 for ; Thu, 14 May 2026 21:59:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3f4d6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 14 May 2026 21:59:48 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 4080419d9a2d - main - 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/main X-Git-Reftype: branch X-Git-Commit: 4080419d9a2d88d44d20baaf3ea01934561819c1 Auto-Submitted: auto-generated Date: Thu, 14 May 2026 21:59:48 +0000 Message-Id: <6a0645d4.3f4d6.29c3838d@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4080419d9a2d88d44d20baaf3ea01934561819c1 commit 4080419d9a2d88d44d20baaf3ea01934561819c1 Author: Colin Percival AuthorDate: 2026-05-14 21:14:09 +0000 Commit: Colin Percival CommitDate: 2026-05-14 21:59:11 +0000 Cloud releases: More firstboot_pkg_upgrade Update a couple more cloudware images which I forgot about earlier. Reviewed by: ziaee Fixes: 464a351267dc ("Cloud releases: Switch to firstboot_pkg_upgrade") Differential Revision: https://reviews.freebsd.org/D57006 --- 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.