vmimage.subr: autoremove -y
Running 'pkg autoremove' without -y results in VM image builds failing
when (bogusly installed) packages are removed.
Fixes: 6a13aeac3c ("vmimage.subr: pkg autoremove after pkg install")
MFC after: immediately (needed for 15.0-RC1)
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user