commit: 65b7de580ed1bd180ab46e1a600a394bca25248b
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 06:04:30 2015 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 06:04:30 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65b7de58
net-misc/chrony: Drop s-s-d --background from init.d script (bug #566972 by
Peter Humphrey and Holger Hoffstätte).
Package-Manager: portage-2.2.26
.../{chrony-9999.ebuild => chrony-2.2-r1.ebuild} | 8 +--
net-misc/chrony/chrony-9999.ebuild | 2 +-
net-misc/chrony/files/chronyd.init-r1 | 70 ++++++++++++++++++++++
3 files changed, 75 insertions(+), 5 deletions(-)
diff --git a/net-misc/chrony/chrony-9999.ebuild
b/net-misc/chrony/chrony-2.2-r1.ebuild
similarity index 92%
copy from net-misc/chrony/chrony-9999.ebuild
copy to net-misc/chrony/chrony-2.2-r1.ebuild
index 2dae405..04ce021 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-2.2-r1.ebuild
@@ -3,15 +3,15 @@
# $Id$
EAPI=5
-inherit eutils git-r3 systemd toolchain-funcs
+inherit eutils systemd toolchain-funcs
DESCRIPTION="NTP client and server programs"
HOMEPAGE="http://chrony.tuxfamily.org/";
-EGIT_REPO_URI="git://git.tuxfamily.org/gitroot/chrony/chrony.git"
+SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz";
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS=""
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86"
IUSE="caps +cmdmon ipv6 libedit +ntp +phc +pps readline +refclock +rtc selinux
+adns"
REQUIRED_USE="
?? ( libedit readline )
@@ -96,7 +96,7 @@ src_install() {
doinfo chrony.info*
- newinitd "${FILESDIR}"/chronyd.init chronyd
+ newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
newconfd "${FILESDIR}"/chronyd.conf chronyd
insinto /etc/${PN}
diff --git a/net-misc/chrony/chrony-9999.ebuild
b/net-misc/chrony/chrony-9999.ebuild
index 2dae405..13709c0 100644
--- a/net-misc/chrony/chrony-9999.ebuild
+++ b/net-misc/chrony/chrony-9999.ebuild
@@ -96,7 +96,7 @@ src_install() {
doinfo chrony.info*
- newinitd "${FILESDIR}"/chronyd.init chronyd
+ newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
newconfd "${FILESDIR}"/chronyd.conf chronyd
insinto /etc/${PN}
diff --git a/net-misc/chrony/files/chronyd.init-r1
b/net-misc/chrony/files/chronyd.init-r1
new file mode 100644
index 0000000..80ec855
--- /dev/null
+++ b/net-misc/chrony/files/chronyd.init-r1
@@ -0,0 +1,70 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+depend() {
+ use dns
+}
+
+checkconfig() {
+ # Note that /etc/chrony/chrony.keys is *NOT* checked. This
+ # is because the user may have specified another key
+ # file, and we don't want to force the user to use that
+ # exact name for the key file.
+ if [ ! -f "${CFGFILE}" ] ; then
+ eerror "Please create ${CFGFILE} and the"
+ eerror "chrony key file (usually /etc/chrony/chrony.keys)"
+ eerror "by using the"
+ eerror ""
+ eerror " chrony.conf.example"
+ eerror " chrony.keys.example"
+ eerror ""
+ eerror "files (from the documentation directory)"
+ eerror "as templates."
+ return 1
+ else
+ # Actually, I tried it, and chrony seems to ignore the pidfile
+ # option. I'm going to leave it here anyway, since you never
+ # know if it might be handy
+ PIDFILE=`awk '/^ *pidfile/{print $2}' "${CFGFILE}"`
+ fi
+ return 0
+}
+
+setxtrarg() {
+ if [ -c /dev/rtc ]; then
+ grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
+ fi
+ grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
+ return 0
+}
+
+start() {
+ checkconfig || return $?
+ setxtrarg
+
+ [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+ ebegin "Starting chronyd"
+ start-stop-daemon \
+ --start \
+ --quiet \
+ --exec /usr/sbin/chronyd \
+ --pidfile "${PIDFILE}" \
+ -- -f "${CFGFILE}" ${ARGS}
+ eend $? "Failed to start chronyd"
+}
+
+stop() {
+ checkconfig || return $?
+
+ [ -n "${PIDFILE}" ] || PIDFILE=/run/chronyd.pid
+
+ ebegin "Stopping chronyd"
+ start-stop-daemon \
+ --stop \
+ --quiet \
+ --pidfile "${PIDFILE}"
+ eend $? "Failed to stop chronyd"
+}
