From owner-svn-src-stable-12@freebsd.org Tue Feb 26 02:20:58 2019 Return-Path: Delivered-To: svn-src-stable-12@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DDACE1500899; Tue, 26 Feb 2019 02:20:58 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (br1.CN84in.dnsmgr.net [69.59.192.140]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2E1FF903BB; Tue, 26 Feb 2019 02:20:58 +0000 (UTC) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: from pdx.rh.CN85.dnsmgr.net (localhost [127.0.0.1]) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3) with ESMTP id x1Q2Kto6042719; Mon, 25 Feb 2019 18:20:55 -0800 (PST) (envelope-from freebsd@pdx.rh.CN85.dnsmgr.net) Received: (from freebsd@localhost) by pdx.rh.CN85.dnsmgr.net (8.13.3/8.13.3/Submit) id x1Q2KtbF042718; Mon, 25 Feb 2019 18:20:55 -0800 (PST) (envelope-from freebsd) From: "Rodney W. Grimes" Message-Id: <201902260220.x1Q2KtbF042718@pdx.rh.CN85.dnsmgr.net> Subject: Re: svn commit: r344557 - stable/12/release/tools In-Reply-To: <201902260129.x1Q1TekR044957@repo.freebsd.org> To: Colin Percival Date: Mon, 25 Feb 2019 18:20:55 -0800 (PST) CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Reply-To: rgrimes@freebsd.org X-Mailer: ELM [version 2.4ME+ PL121h (25)] MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII X-Rspamd-Queue-Id: 2E1FF903BB X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.93 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; REPLY(-4.00)[]; NEURAL_HAM_SHORT(-0.93)[-0.929,0] X-BeenThere: svn-src-stable-12@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for only the 12-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Feb 2019 02:20:59 -0000 > 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