aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Percival <cperciva@FreeBSD.org>2019-02-19 23:24:39 +0000
committerColin Percival <cperciva@FreeBSD.org>2019-02-19 23:24:39 +0000
commit827e6ec07d1445b169aef0fce8fc77718c454fbd (patch)
tree8a9007be4df199d901bdc5e8b2bd140ed2375c45
parentd793cf7019f9e8061c3a8e4effd6670adb305acc (diff)
downloadsrc-827e6ec07d1445b169aef0fce8fc77718c454fbd.tar.gz
src-827e6ec07d1445b169aef0fce8fc77718c454fbd.zip
Fix sed script to insert Amazon NTP server into ntp.conf once rather
than twice. Reported by: Rafal Lukawiecki MFC after: 1 week
Notes
Notes: svn path=/head/; revision=344315
-rw-r--r--release/tools/ec2.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/release/tools/ec2.conf b/release/tools/ec2.conf
index c0164fc8c3f1..3be4a5015dbd 100644
--- a/release/tools/ec2.conf
+++ b/release/tools/ec2.conf
@@ -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