diff options
| author |   Pacho Ramos <pacho@gentoo.org> | 2014-07-01 16:54:26 +0000 |
|---|---|---|
| committer | Pacho Ramos <pacho@gentoo.org> | 2014-07-01 16:54:26 +0000 |
| commit | f9cbc6328052b8a64be68f3f2825558d5b4677fe (patch) | |
| tree | 4f222f78ec9de3b9a14ef81ad887a7598f923209 /net-misc | |
| parent | Pull in virtual/libgudev to avoid using obsolete USE="gudev" of virtual/udev. (diff) | |
| download | gentoo-2-f9cbc6328052b8a64be68f3f2825558d5b4677fe.tar.gz gentoo-2-f9cbc6328052b8a64be68f3f2825558d5b4677fe.tar.bz2 gentoo-2-f9cbc6328052b8a64be68f3f2825558d5b4677fe.zip | |
ntpdate needs network to be really connected and working (#501298 by Juergen Rose), toggle options for usage with 'caps' USE (#514660 by Matthias Maier).
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'net-misc')
| -rw-r--r-- | net-misc/ntp/ChangeLog | 7 | ||||
| -rw-r--r-- | net-misc/ntp/files/ntpdate.service | 2 | ||||
| -rw-r--r-- | net-misc/ntp/ntp-4.2.6_p5-r10.ebuild | 3 |
3 files changed, 9 insertions, 3 deletions
diff --git a/net-misc/ntp/ChangeLog b/net-misc/ntp/ChangeLog index 2fc92ecfbbae..5276bf95d16d 100644 --- a/net-misc/ntp/ChangeLog +++ b/net-misc/ntp/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for net-misc/ntp # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.218 2014/06/23 12:55:57 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ChangeLog,v 1.219 2014/07/01 16:54:26 pacho Exp $ + + 01 Jul 2014; Pacho Ramos <pacho@gentoo.org> files/ntpdate.service, + ntp-4.2.6_p5-r10.ebuild: + ntpdate needs network to be really connected and working (#501298 by Juergen + Rose), toggle options for usage with 'caps' USE (#514660 by Matthias Maier). 23 Jun 2014; Pacho Ramos <pacho@gentoo.org> ntp-4.2.6_p5-r10.ebuild: Old unit file was still being installed by error (#514660 by Matthias Maier) diff --git a/net-misc/ntp/files/ntpdate.service b/net-misc/ntp/files/ntpdate.service index e223839201f4..a6c75c9c14c0 100644 --- a/net-misc/ntp/files/ntpdate.service +++ b/net-misc/ntp/files/ntpdate.service @@ -1,6 +1,6 @@ [Unit] Description=Set time via NTP using ntpdate -After=network.target nss-lookup.target +After=network-online.target nss-lookup.target Before=time-sync.target Wants=time-sync.target diff --git a/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild b/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild index d7c6bfc47d2c..e0672898e8b1 100644 --- a/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild +++ b/net-misc/ntp/ntp-4.2.6_p5-r10.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.13 2014/06/23 12:55:57 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-misc/ntp/ntp-4.2.6_p5-r10.ebuild,v 1.14 2014/07/01 16:54:26 pacho Exp $ EAPI="4" @@ -107,6 +107,7 @@ src_install() { rm usr/share/man/*/ntpd.8 || die else systemd_newunit "${FILESDIR}"/ntpd.service-r1 ntpd.service + use caps && sed -i '/ExecStart/ s|$| -u ntp:ntp|' "${ED}"/usr/lib/systemd/system/ntpd.service systemd_enable_ntpunit 60-ntpd ntpd.service fi |