diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-07-21 03:18:53 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-07-21 03:18:53 +0000 |
| commit | 6a277d6e8c2181035e43b3f6e0734be5d6cc3367 (patch) | |
| tree | 2a5641a2bf8cf669c0776dd5056a8f12ba97f7fd /release | |
| parent | a7d5d8d9d06e625d43006a93f92bb8f14fa9333b (diff) | |
| download | src-6a277d6e8c2181035e43b3f6e0734be5d6cc3367.tar.gz src-6a277d6e8c2181035e43b3f6e0734be5d6cc3367.zip | |
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
Notes
Notes:
svn path=/head/; revision=285733
Diffstat (limited to 'release')
| -rw-r--r-- | release/tools/vagrant.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/tools/vagrant.conf b/release/tools/vagrant.conf index 159da4fa21a9..5617b96fa17d 100644 --- a/release/tools/vagrant.conf +++ b/release/tools/vagrant.conf @@ -15,9 +15,9 @@ vagrant_common () { # catalogue and install or update pkg when the instance first # launches, so these files would just be replaced anyway; removing # 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 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. echo 'ifconfig_DEFAULT="SYNCDHCP"' >> ${DESTDIR}/etc/rc.conf |