svn commit: r363786 - stable/12/release/tools

[Colin Percival]

Author: cperciva
Date: Mon Aug  3 01:00:20 2020
New Revision: 363786
URL: https://svnweb.freebsd.org/changeset/base/363786

Log:
  MFC r362791:
    Make EC2 AMIs use portsnap and freebsd-update mirrors hosted in AWS

Modified:
  stable/12/release/tools/ec2.conf
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/release/tools/ec2.conf
==============================================================================
--- stable/12/release/tools/ec2.conf	Sun Aug  2 23:50:55 2020	(r363785)
+++ stable/12/release/tools/ec2.conf	Mon Aug  3 01:00:20 2020	(r363786)
@@ -111,6 +111,12 @@ vm_extra_pre_umount() {
 		's/^#ChallengeResponseAuthentication yes/ChallengeResponseAuthentication no/' \
 		${DESTDIR}/etc/ssh/sshd_config
 
+	# Use FreeBSD Update and Portsnap mirrors hosted in AWS
+	sed -i '' -e 's/update.FreeBSD.org/aws.update.FreeBSD.org/' \
+		${DESTDIR}/etc/freebsd-update.conf
+	sed -i '' -e 's/portsnap.FreeBSD.org/aws.portsnap.FreeBSD.org/' \
+		${DESTDIR}/etc/portsnap.conf
+
 	# Use the NTP service provided by Amazon
 	sed -i '' -e 's/^pool/#pool/' \
 		-e '1,/^#server/s/^#server.*/server 169.254.169.123 iburst/' \