diff options
| author | Colin Percival <cperciva@FreeBSD.org> | 2025-10-03 01:06:44 +0000 |
|---|---|---|
| committer | Colin Percival <cperciva@FreeBSD.org> | 2025-10-03 01:06:44 +0000 |
| commit | 86221f965c06efa1cd5b2da640ae23edded7c8b9 (patch) | |
| tree | bc05cc88fa9621c222dd347b3f43b593af130fef /release/tools | |
| parent | 5c5c0571c2984669024dca5356f973ffc18a3e02 (diff) | |
Diffstat (limited to 'release/tools')
| -rw-r--r-- | release/tools/vmimage.subr | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/release/tools/vmimage.subr b/release/tools/vmimage.subr index f307e7888e93..fba09d532b4a 100644 --- a/release/tools/vmimage.subr +++ b/release/tools/vmimage.subr @@ -250,9 +250,16 @@ vm_emulation_cleanup() { } vm_extra_pkg_rmcache() { - if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then - chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ - /usr/local/sbin/pkg clean -y -a + if [ -n "${NO_ROOT}" ]; then + ${PKG_CMD} \ + -o ASSUME_ALWAYS_YES=yes \ + -r ${DESTDIR} \ + clean -y -a + else + if [ -e ${DESTDIR}/usr/local/sbin/pkg ]; then + chroot ${DESTDIR} ${EMULATOR} env ASSUME_ALWAYS_YES=yes \ + /usr/local/sbin/pkg clean -y -a + fi fi return 0 |