Subject: [alpine-devel] [PATCH] main/chrony: updated with latest initd and confd from gentoo

From: Duane Hughes <[email-masked]>
Date: Thu, 28 Apr 2011 07:26:12 +0000

fixes #603
---
 main/chrony/chronyd.confd |    6 ------
 main/chrony/chronyd.initd |    9 +++++++++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/main/chrony/chronyd.confd b/main/chrony/chronyd.confd
index 560825c..fc43a95 100644
--- a/main/chrony/chronyd.confd
+++ b/main/chrony/chronyd.confd
@@ -10,9 +10,3 @@ CFGFILE="/etc/chrony/chrony.conf"
 # the gain or loss rate across system reboots and shutdowns.
 
 ARGS=""
-
-# devfs creates the device for RTC if it's compiled into kernel
-test -c /dev/rtc && {
-       grep -q '^rtcfile' "${CFGFILE}" && ARGS="${ARGS} -s"
-}
-grep -q '^dumponexit$' "${CFGFILE}" && ARGS="${ARGS} -r"
diff --git a/main/chrony/chronyd.initd b/main/chrony/chronyd.initd
index bf19f31..4fe5135 100644
--- a/main/chrony/chronyd.initd
+++ b/main/chrony/chronyd.initd
@@ -35,8 +35,17 @@ checkconfig() {
 	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=/var/run/chronyd.pid
 
-- 
1.7.4.5

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---