mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-20 05:51:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

ntp: sync ebuild with upstream

Browse Source 
We were missing `Conflicts=systemd-timesyncd.service` which has been
added to the upstream ebuild. A few other minor tweaks but nothing big.
This commit is contained in:
Michael Marineau 2014-12-19 15:11:41 -08:00
parent 16decb38cb
commit f5031cb725
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpd.service vendored
View File

@ -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

1
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/ntpdate.service vendored
View File

@ -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

1
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/files/sntp.service vendored
View File

@ -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

10
sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r12.ebuild → sdk_container/src/third_party/coreos-overlay/net-misc/ntp/ntp-4.2.6_p5-r13.ebuild vendored
View File

@ -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