DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=from:to:cc:subject:date:message-id:x-mailer;
        b=oIV07cC4KyYeXsQt6LFS145t1+NZlfPSKKMKmlcSWC06jXkZahycJgu3iI1524zAIM
         vOT+ZSGtWzdu2ql62SmEnKgnk9I1fvKMigLaJiQE4zM5taGh9jOQ5FzIGqgRf7/G4RJ0
         7nPpb4vAmfswrJ7EZ31I1AWIlwUD9K1kvfccM=
From: Duane Hughes <duanejevon@gmail.com>
To: alpine-devel@lists.alpinelinux.org
Cc: Duane Hughes <duanejevon@gmail.com>
Subject: [alpine-devel] [PATCH] main/chrony: updated with latest initd and confd from gentoo
Date: Thu, 28 Apr 2011 07:26:12 +0000
Message-Id: <1303975572-1336-1-git-send-email-duanejevon@gmail.com>
Precedence: list

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:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---