Date: Mon, 25 Feb 2019 18:20:55 -0800 (PST) From: "Rodney W. Grimes" <freebsd@pdx.rh.CN85.dnsmgr.net> To: Colin Percival <cperciva@freebsd.org> Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: Re: svn commit: r344557 - stable/12/release/tools Message-ID: <201902260220.x1Q2KtbF042718@pdx.rh.CN85.dnsmgr.net> In-Reply-To: <201902260129.x1Q1TekR044957@repo.freebsd.org>
next in thread | previous 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) Does this issue also exist in stable/11, as iirc 11.3 would be the next release that is coming on the schedule. > 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 > > -- Rod Grimes rgrimes@freebsd.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902260220.x1Q2KtbF042718>