summaryrefslogtreecommitdiffstats
path: root/release
diff options
context:
space:
mode:
authorgjb <gjb@FreeBSD.org>2017-05-26 19:02:46 +0000
committergjb <gjb@FreeBSD.org>2017-05-26 19:02:46 +0000
commitfd30a6e2c972b4f9a9d61de5be7377caf9eba740 (patch)
treeb3aadd234957e1a5b2639ff63150ecd89443c1d6 /release
parent766c3955f192877490d0f7b78a7f0b6df18bd913 (diff)
downloadFreeBSD-src-fd30a6e2c972b4f9a9d61de5be7377caf9eba740.zip
FreeBSD-src-fd30a6e2c972b4f9a9d61de5be7377caf9eba740.tar.gz
MFC r314935 (thompsa):
Change ec2.conf to use the pkg tool from a chroot rather than trying to bootstrap it and fail from the livecd readonly filesystem. Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release')
-rw-r--r--release/tools/ec2.conf3
1 files changed, 2 insertions, 1 deletions
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index 85714c3..4581788 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -32,7 +32,8 @@ vm_extra_pre_umount() {
# 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} delete -f -y pkg
+ chroot ${DESTDIR} env ASSUME_ALWAYS_YES=yes \
+ /usr/sbin/pkg delete -f -y pkg
rm ${DESTDIR}/var/db/pkg/repo-*.sqlite
# The size of the EC2 root disk can be configured at instance launch
OpenPOWER on IntegriCloud