From f0ecf357aad984ac3b175f41027baac06d886f16 Mon Sep 17 00:00:00 2001
From: Colin Percival <cperciva@FreeBSD.org>
Date: Sat, 24 Jan 2026 12:12:14 -0800
Subject: [PATCH] vmimage.subr: Install pkg on pkgbase images

When building VM and Cloud images with a packaged base system, install
the pkg package; this makes it possible for the base system to be
updated without installing pkg from the FreeBSD-ports repository.

Sponsored by:	Amazon
---
 release/tools/vmimage.subr | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 0ca9ba267ce..f7fc9906c04 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -84,6 +84,9 @@ vm_base_packages_list() {
 		echo FreeBSD-set-lib32-dbg
 	esac
 	echo FreeBSD-set-tests
+	# Also install pkg, since systems with a packaged base system should
+	# have the tools to upgrade themselves.
+	echo pkg
 }
 
 vm_extra_filter_base_packages() {