diff options
| author | Glen Barber <gjb@FreeBSD.org> | 2015-06-24 21:30:35 +0000 |
|---|---|---|
| committer | Glen Barber <gjb@FreeBSD.org> | 2015-06-24 21:30:35 +0000 |
| commit | 67076e4d58477df88807c784c3c6446d76d13df8 (patch) | |
| tree | aac585791ea0264d8e9496791362c57a3aceb99a /release/tools/ec2.conf | |
| parent | c3c85727d0422ca2fb8f215ebd702b44ca7f9ab7 (diff) | |
| download | src-67076e4d58477df88807c784c3c6446d76d13df8.tar.gz src-67076e4d58477df88807c784c3c6446d76d13df8.zip | |
Ensure ASSUME_ALWAYS_YES is set when deleting pkg(8) from the
DESTDIR, otherwise it can get stuck in ttyin.
This means no 10-STABLE EC2 images this week.
MFC after: 3 days
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=284780
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 4969ad560a58..9472ec59d89f 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 |