git: 6ac6550a91f1 - releng/15.0 - vmimage.subr: autoremove -y
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 16 Nov 2025 03:12:08 UTC
The branch releng/15.0 has been updated by cperciva:
URL: https://cgit.FreeBSD.org/src/commit/?id=6ac6550a91f1df265a36c368052d908c3294e348
commit 6ac6550a91f1df265a36c368052d908c3294e348
Author: Colin Percival <cperciva@FreeBSD.org>
AuthorDate: 2025-11-16 00:39:58 +0000
Commit: Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2025-11-16 03:11:23 +0000
vmimage.subr: autoremove -y
Running 'pkg autoremove' without -y results in VM image builds failing
when (bogusly installed) packages are removed.
Approved by: re (cperciva)
Fixes: 6a13aeac3c1f ("vmimage.subr: pkg autoremove after pkg install")
MFC after: immediately (needed for 15.0-RC1)
(cherry picked from commit 509dfd369046ee45b724d119c9eed43228fbb894)
(cherry picked from commit 9600598a5c011c161813f929be53c3748a6a0f01)
---
release/tools/vmimage.subr | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr
index 3455f11d9794..7035b107ae22 100644
--- a/release/tools/vmimage.subr
+++ b/release/tools/vmimage.subr
@@ -223,7 +223,7 @@ vm_extra_install_packages() {
-o REPOS_DIR=${PKG_REPOS_DIR} \
-o PKG_DBDIR=${DESTDIR}/var/db/pkg \
-r ${DESTDIR} \
- autoremove
+ autoremove -y
if [ -n "${NOPKGBASE}" ]; then
metalog_add_data ./var/db/pkg/local.sqlite
fi
@@ -239,7 +239,7 @@ vm_extra_install_packages() {
/usr/sbin/pkg install -y ${p}
done
chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \
- /usr/sbin/pkg autoremove
+ /usr/sbin/pkg autoremove -y
fi
return 0