From 7cf194c67e3ba4dca640d19556b9bde4c869127f Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Thu, 27 Nov 2014 07:53:47 -0800 Subject: [PATCH 1/2] net-misc/ntp: use the coreos ntp vendor pool --- .../coreos-overlay/net-misc/ntp/files/ntp.conf | 8 ++++---- .../coreos-overlay/net-misc/ntp/files/ntpdate.service | 2 +- .../coreos-overlay/net-misc/ntp/files/sntp.service | 2 +- .../{ntp-4.2.6_p5-r11.ebuild => ntp-4.2.6_p5-r12.ebuild} | 0 4 files changed, 6 insertions(+), 6 deletions(-) rename sdk_container/src/third_party/coreos-overlay/net-misc/ntp/{ntp-4.2.6_p5-r11.ebuild => ntp-4.2.6_p5-r12.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf index 8411960435..57dc00ec39 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntp.conf @@ -1,8 +1,8 @@ # Common pool -server 0.pool.ntp.org -server 1.pool.ntp.org -server 2.pool.ntp.org -server 3.pool.ntp.org +server 0.coreos.pool.ntp.org +server 1.coreos.pool.ntp.org +server 2.coreos.pool.ntp.org +server 3.coreos.pool.ntp.org # Warning: Using default NTP settings will leave your NTP # server accessible to all hosts on the Internet. diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service index 3cb4d1855d..b9f435486b 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service @@ -6,7 +6,7 @@ Wants=time-sync.target [Service] Type=oneshot -Environment="SERVER=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" +Environment="SERVER=0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org" ExecStart=/usr/sbin/ntpdate -b -u $SERVER RemainAfterExit=yes diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service index 5be60addb8..647a06eba1 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service @@ -6,7 +6,7 @@ Wants=time-sync.target [Service] Type=oneshot -Environment="SERVER=0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" +Environment="SERVER=0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org" ExecStart=/usr/bin/sntp -s $SERVER RemainAfterExit=yes diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r12.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r11.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r12.ebuild From 6aa7bb1996003f0b4e5383a84ec8d6833daec68a Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Fri, 28 Nov 2014 15:00:37 -0800 Subject: [PATCH 2/2] sys-apps/systemd: use the coreos ntp vendor pool --- .../systemd/{systemd-215-r15.ebuild => systemd-215-r16.ebuild} | 2 +- .../coreos-overlay/sys-apps/systemd/systemd-9999.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-215-r15.ebuild => systemd-215-r16.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r15.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r16.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r15.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r16.ebuild index 4714916039..d4d3a128ce 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r15.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-215-r16.ebuild @@ -234,7 +234,7 @@ multilib_src_configure() { --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces" - --with-ntp-servers="0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" + --with-ntp-servers="0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org" # no default name servers --with-dns-servers= diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild index 97b6456e38..0e96c1f843 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-9999.ebuild @@ -231,7 +231,7 @@ multilib_src_configure() { --with-dbussystemservicedir="${EPREFIX}/usr/share/dbus-1/system-services" --with-dbusinterfacedir="${EPREFIX}/usr/share/dbus-1/interfaces" - --with-ntp-servers="0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org" + --with-ntp-servers="0.coreos.pool.ntp.org 1.coreos.pool.ntp.org 2.coreos.pool.ntp.org 3.coreos.pool.ntp.org" # no default name servers --with-dns-servers=