From f5031cb7250f3e01eb2e7ecbceb80a7da4070c49 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 19 Dec 2014 15:11:41 -0800 Subject: [PATCH] ntp: sync ebuild with upstream We were missing `Conflicts=systemd-timesyncd.service` which has been added to the upstream ebuild. A few other minor tweaks but nothing big. --- .../coreos-overlay/net-misc/ntp/files/ntpd.service | 3 ++- .../coreos-overlay/net-misc/ntp/files/ntpdate.service | 1 + .../coreos-overlay/net-misc/ntp/files/sntp.service | 1 + ...ntp-4.2.6_p5-r12.ebuild => ntp-4.2.6_p5-r13.ebuild} | 10 ++++------ 4 files changed, 8 insertions(+), 7 deletions(-) rename sdk_container/src/third_party/coreos-overlay/net-misc/ntp/{ntp-4.2.6_p5-r12.ebuild => ntp-4.2.6_p5-r13.ebuild} (95%) diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service index 8dc3e0b989..65c109b243 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service @@ -1,9 +1,10 @@ [Unit] Description=Network Time Service After=ntpdate.service sntp.service +Conflicts=systemd-timesyncd.service [Service] -ExecStart=/usr/sbin/ntpd -g -n -u ntp:ntp -f /var/lib/ntp/ntp.drift +ExecStart=/usr/sbin/ntpd -g -n -f /var/lib/ntp/ntp.drift PrivateTmp=true Restart=always 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 b9f435486b..9d18c8309b 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 @@ -3,6 +3,7 @@ Description=Set time via NTP using ntpdate After=network.target nss-lookup.target Before=time-sync.target Wants=time-sync.target +Conflicts=systemd-timesyncd.service [Service] Type=oneshot 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 647a06eba1..6d3e61feb3 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 @@ -3,6 +3,7 @@ Description=Set time via SNTP After=network.target nss-lookup.target Before=time-sync.target Wants=time-sync.target +Conflicts=systemd-timesyncd.service [Service] Type=oneshot diff --git a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r12.ebuild b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r13.ebuild similarity index 95% rename from sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r12.ebuild rename to sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r13.ebuild index 13d20c99fb..d8b5269c98 100644 --- a/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r12.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r13.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild,v 1.12 2014/04/06 15:03:40 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild,v 1.15 2014/11/02 09:09:15 swift Exp $ EAPI="4" @@ -24,9 +24,9 @@ DEPEND=">=sys-libs/ncurses-5.2 !openntpd? ( !net-misc/openntpd ) snmp? ( net-analyzer/net-snmp ) ssl? ( dev-libs/openssl ) - selinux? ( sec-policy/selinux-ntp ) parse-clocks? ( net-misc/pps-tools )" RDEPEND="${DEPEND} + selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax )" PDEPEND="openntpd? ( net-misc/openntpd )" @@ -96,12 +96,10 @@ src_install() { rm usr/share/man/*/ntpd.8 || die else systemd_dounit "${FILESDIR}"/ntpd.service + use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' \ + "${ED}/$(systemd_get_unitdir)/ntpd.service" systemd_enable_ntpunit 60-ntpd ntpd.service systemd_enable_service multi-user.target ntpd.service - if ! use caps ; then - sed -i "s|-u ntp:ntp||" \ - "${ED}/$(systemd_get_unitdir)/ntpd.service" || die - fi fi systemd_dounit "${FILESDIR}"/ntpdate.service