diff options
| author | gjb <gjb@FreeBSD.org> | 2015-06-25 14:58:50 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2015-06-25 14:58:50 +0000 |
| commit | b1c7823af3da91b256ed232464a29c53e8c62fe1 (patch) | |
| tree | dda94189ba3d6cb85a6c0440e5cae0b5fb0a3fed /release/tools/ec2.conf | |
| parent | 95fcbd85e830ba474dede020a3b792ae31138e2b (diff) | |
| download | FreeBSD-src-b1c7823af3da91b256ed232464a29c53e8c62fe1.zip FreeBSD-src-b1c7823af3da91b256ed232464a29c53e8c62fe1.tar.gz | |
MFC r284780, r284811, r284812:
r284780:
Ensure ASSUME_ALWAYS_YES is set when deleting pkg(8) from the
DESTDIR, otherwise it can get stuck in ttyin.
r284811:
Consider PRERELEASE builds snapshots, in addition to CURRENT
and STABLE.
r284812:
Change the hour:minute delimiter from ':' to '-', since
the former is an invalid character in EC2 images.
Approved by: re (glebius, insta-MFC)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'release/tools/ec2.conf')
| -rw-r--r-- | release/tools/ec2.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf index 4969ad5..9472ec5 100644 --- a/release/tools/ec2.conf +++ b/release/tools/ec2.conf @@ -32,7 +32,7 @@ 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. - 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 # The size of the EC2 root disk can be configured at instance launch |
