svn commit: r284780 - head/release/tools

[Glen Barber]

Author: gjb
Date: Wed Jun 24 21:30:35 2015
New Revision: 284780
URL: https://svnweb.freebsd.org/changeset/base/284780

Log:
  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

Modified:
  head/release/tools/ec2.conf

Modified: head/release/tools/ec2.conf
==============================================================================
--- head/release/tools/ec2.conf	Wed Jun 24 20:51:48 2015	(r284779)
+++ head/release/tools/ec2.conf	Wed Jun 24 21:30:35 2015	(r284780)
@@ -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