From owner-svn-src-all@FreeBSD.ORG  Tue Mar 31 04:35:36 2015
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id BD200E65;
 Tue, 31 Mar 2015 04:35:36 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id A7D7BF08;
 Tue, 31 Mar 2015 04:35:36 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2V4ZaLf037353;
 Tue, 31 Mar 2015 04:35:36 GMT (envelope-from cperciva@FreeBSD.org)
Received: (from cperciva@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2V4ZaZk037352;
 Tue, 31 Mar 2015 04:35:36 GMT (envelope-from cperciva@FreeBSD.org)
Message-Id: <201503310435.t2V4ZaZk037352@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: cperciva set sender to
 cperciva@FreeBSD.org using -f
From: Colin Percival <cperciva@FreeBSD.org>
Date: Tue, 31 Mar 2015 04:35:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r280884 - head/release/tools
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 31 Mar 2015 04:35:36 -0000

Author: cperciva
Date: Tue Mar 31 04:35:35 2015
New Revision: 280884
URL: https://svnweb.freebsd.org/changeset/base/280884

Log:
  It would help if I committed the right patch...

Modified:
  head/release/tools/ec2.conf

Modified: head/release/tools/ec2.conf
==============================================================================
--- head/release/tools/ec2.conf	Tue Mar 31 04:31:42 2015	(r280883)
+++ head/release/tools/ec2.conf	Tue Mar 31 04:35:35 2015	(r280884)
@@ -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 pkg
+	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