summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2014-09-12 04:25:51 +0000
committerMike Gilbert <floppym@gentoo.org>2014-09-12 04:25:51 +0000
commita085fd3ccbc882d4c0b1bf696ac075b0087962d2 (patch)
treebe1bfb6d807446ac7c3c454ca4f7a7f37eae6222 /net-misc/chrony
parentadd arm keyword, bug 522574, thanks Andrius Štikonas (diff)
downloadgentoo-2-a085fd3ccbc882d4c0b1bf696ac075b0087962d2.tar.gz
gentoo-2-a085fd3ccbc882d4c0b1bf696ac075b0087962d2.tar.bz2
gentoo-2-a085fd3ccbc882d4c0b1bf696ac075b0087962d2.zip
systemd unit improvements, bug 483456.
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)
Diffstat (limited to 'net-misc/chrony')
-rw-r--r--net-misc/chrony/ChangeLog6
-rw-r--r--net-misc/chrony/chrony-1.31.ebuild4
-rw-r--r--net-misc/chrony/files/chronyd.service-r212
3 files changed, 19 insertions, 3 deletions
diff --git a/net-misc/chrony/ChangeLog b/net-misc/chrony/ChangeLog
index 1fa08b6262db..184c57888063 100644
--- a/net-misc/chrony/ChangeLog
+++ b/net-misc/chrony/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-misc/chrony
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.140 2014/09/11 08:13:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/ChangeLog,v 1.141 2014/09/12 04:25:51 floppym Exp $
+
+ 12 Sep 2014; Mike Gilbert <floppym@gentoo.org> +files/chronyd.service-r2,
+ chrony-1.31.ebuild:
+ systemd unit improvements, bug 483456.
*chrony-1.31 (11 Sep 2014)
diff --git a/net-misc/chrony/chrony-1.31.ebuild b/net-misc/chrony/chrony-1.31.ebuild
index bf6515c7a8fa..c700d40e33e1 100644
--- a/net-misc/chrony/chrony-1.31.ebuild
+++ b/net-misc/chrony/chrony-1.31.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/chrony/chrony-1.31.ebuild,v 1.1 2014/09/11 08:13:27 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/chrony/chrony-1.31.ebuild,v 1.2 2014/09/12 04:25:51 floppym Exp $
EAPI=5
inherit eutils systemd toolchain-funcs
@@ -76,6 +76,6 @@ src_install() {
insinto /etc/logrotate.d
newins "${FILESDIR}"/chrony.logrotate chrony
- systemd_newunit "${FILESDIR}"/chronyd.service-r1 chronyd.service
+ systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
systemd_enable_ntpunit 50-chrony chronyd.service
}
diff --git a/net-misc/chrony/files/chronyd.service-r2 b/net-misc/chrony/files/chronyd.service-r2
new file mode 100644
index 000000000000..90255675c838
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.service-r2
@@ -0,0 +1,12 @@
+[Unit]
+Description=Chrony Network Time Service
+After=ntpdate.service sntp.service network.target
+Conflicts=ntpd.service systemd-timesyncd.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/chronyd
+PIDFile=/run/chronyd.pid
+
+[Install]
+WantedBy=multi-user.target