diff options
| author | gjb <gjb@FreeBSD.org> | 2017-05-26 19:02:46 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2017-05-26 19:02:46 +0000 |
| commit | 3dfef665bb44388f011c8d12d1729ef8e043b147 (patch) | |
| tree | 6acc5c77be0d23f6c0ff0a7c833e9bce3fe9c9ed /release/tools | |
| parent | 40ff5482458a82397b6a6f723e420fc7fa1a3cdb (diff) | |
| download | FreeBSD-src-3dfef665bb44388f011c8d12d1729ef8e043b147.zip FreeBSD-src-3dfef665bb44388f011c8d12d1729ef8e043b147.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/tools')
| -rw-r--r-- | release/tools/ec2.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index a273449..3dafbb5 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 |
