Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Oct 2023 15:54:31 GMT
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: e76b9cc26d68 - releng/14.0 - release/ec2: Remove references to portsnap
Message-ID:  <202310051554.395FsViO046565@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch releng/14.0 has been updated by cperciva:

URL: https://cgit.FreeBSD.org/src/commit/?id=e76b9cc26d68fa0d398571c0142acc1a54bcb1a8

commit e76b9cc26d68fa0d398571c0142acc1a54bcb1a8
Author:     Mark Johnston <markj@FreeBSD.org>
AuthorDate: 2023-09-27 22:02:36 +0000
Commit:     Colin Percival <cperciva@FreeBSD.org>
CommitDate: 2023-10-05 15:54:02 +0000

    release/ec2: Remove references to portsnap
    
    We no longer install a default portsnap.conf, so the sed invocation just
    generates an error.
    
    Reviewed by:    cperciva
    Approved by:    re (gjb)
    Differential Revision:  https://reviews.freebsd.org/D42003
    
    (cherry picked from commit 63aa2e91342ead0495eada5667f413f0cf8eb56a)
    (cherry picked from commit 1cc968931bef915dd700b5eaefc8e6bd13fdb8a0)
---
 release/tools/ec2.conf | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index 71f9f5c330cb..d033739adc26 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -126,11 +126,9 @@ EOF
 		's/^#KbdInteractiveAuthentication yes/KbdInteractiveAuthentication no/' \
 		${DESTDIR}/etc/ssh/sshd_config
 
-	# Use FreeBSD Update and Portsnap mirrors hosted in AWS
+	# Use FreeBSD Update 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/' \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202310051554.395FsViO046565>