Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 26 Feb 2019 01:29:40 +0000 (UTC)
From:      Colin Percival <cperciva@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r344557 - stable/12/release/tools
Message-ID:  <201902260129.x1Q1TekR044957@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: cperciva
Date: Tue Feb 26 01:29:40 2019
New Revision: 344557
URL: https://svnweb.freebsd.org/changeset/base/344557

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

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	Mon Feb 25 23:49:58 2019	(r344556)
+++ stable/12/release/tools/ec2.conf	Tue Feb 26 01:29:40 2019	(r344557)
@@ -96,7 +96,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



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