summaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorDuane Hughes <duanejevon@gmail.com>2011-04-28 07:26:12 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2011-04-28 09:16:39 +0000
commit1f853d411dac71a35fa6932e147cbb7d6b5d1b92 (patch)
tree0c4fb302200633ab33bec85a2a9a6b46fb09e413 /main
parent5a5a78dc90df3cefb1c9cce93c308054a0e2114c (diff)
downloadaports-1f853d411dac71a35fa6932e147cbb7d6b5d1b92.tar.bz2
aports-1f853d411dac71a35fa6932e147cbb7d6b5d1b92.tar.xz
main/chrony: updated with latest initd and confd from gentoo
fixes #603
Diffstat (limited to 'main')
-rw-r--r--main/chrony/chronyd.confd6
-rw-r--r--main/chrony/chronyd.initd9
2 files changed, 9 insertions, 6 deletions
diff --git a/main/chrony/chronyd.confd b/main/chrony/chronyd.confd
index 560825c2c..fc43a95c4 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 bf19f3198..4fe513561 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