KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cloud releases: More firstboot_pkg_upgrade

Browse Source 
Update a couple more cloudware images which I forgot about earlier.

Reviewed by:	ziaee
Fixes: 464a351267 ("Cloud releases: Switch to firstboot_pkg_upgrade")
Differential Revision:	https://reviews.freebsd.org/D57006
This commit is contained in:
Colin Percival
2026-05-14 14:14:09 -07:00
parent 464a351267
commit 4080419d9a
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
release/tools/basic-cloudinit.conf
+4 -3
View File
@@ -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
release/tools/ec2-small.conf
+6 -3
View File
@@ -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.