Fix an out-of-order execution issue regarding pkg(8):
- pkg(8) cannot be removed before subsequent reinvocations - The PKG_CACHEDIR cannot be cleaned after the repo*.sqlite has been removed - pkg(8) cannot be removed as a precursor to any of the other steps involved here MFC after: 3 days X-MFC-With: r285722 X-MFC-Before: 10.2-{BETA3,RC1} (whichever happens next) Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
a7d5d8d9d0
commit
6a277d6e8c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=285733
@ -15,9 +15,9 @@ vagrant_common () {
|
|||||||
# catalogue and install or update pkg when the instance first
|
# catalogue and install or update pkg when the instance first
|
||||||
# launches, so these files would just be replaced anyway; removing
|
# launches, so these files would just be replaced anyway; removing
|
||||||
# them from the image allows it to boot faster.
|
# them from the image allows it to boot faster.
|
||||||
|
env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a
|
||||||
env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
|
env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} delete -f -y pkg
|
||||||
rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
|
rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
|
||||||
env ASSUME_ALWAYS_YES=yes pkg -c ${DESTDIR} clean -y -a
|
|
||||||
|
|
||||||
# Vagrant instances use DHCP to get their network configuration.
|
# Vagrant instances use DHCP to get their network configuration.
|
||||||
echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
|
echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf
|
||||||
|
Loading…
Reference in New Issue
Block a user