From b1c7823af3da91b256ed232464a29c53e8c62fe1 Mon Sep 17 00:00:00 2001 From: gjb Date: Thu, 25 Jun 2015 14:58:50 +0000 Subject: 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 --- release/tools/ec2.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'release/tools') 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 -- cgit v1.1