svn commit: r344563 - stable/11/release/tools

Colin Percival cperciva at FreeBSD.org
Tue Feb 26 05:37:51 UTC 2019


Author: cperciva
Date: Tue Feb 26 05:37:49 2019
New Revision: 344563
URL: https://svnweb.freebsd.org/changeset/base/344563

Log:
  MFC r344315:
    Fix sed script to insert Amazon NTP server into ntp.conf once rather
    than twice.
  
  Reminded by:	rgrimes

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

Modified: stable/11/release/tools/ec2.conf
==============================================================================
--- stable/11/release/tools/ec2.conf	Tue Feb 26 04:56:10 2019	(r344562)
+++ stable/11/release/tools/ec2.conf	Tue Feb 26 05:37:49 2019	(r344563)
@@ -83,7 +83,7 @@ vm_extra_pre_umount() {
 
 	# Use the NTP service provided by Amazon
 	sed -i '' -e 's/^pool/#pool/' \
-		-e 's/^#server.*/server 169.254.169.123 iburst/' \
+		-e '1,/^#server/s/^#server.*/server 169.254.169.123 iburst/' \
 		${DESTDIR}/etc/ntp.conf
 
 	# The first time the AMI boots, the installed "first boot" scripts


More information about the svn-src-all mailing list