From 1dc8c501a66ac05bea4700809ae22da9231bb951 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar0@gmail.com>
Date: Fri, 30 Oct 2020 17:02:49 +0100
Subject: [PATCH] chrony: rework loading of configuration

Instead of loading /etc/chrony/chrony.conf from the file generated from
the chrony UCI configuration, use the confdir directive in the main
config to load the generated file. This should make it obvious that
chrony is configured in UCI and it can also be easily disabled.

Signed-off-by: Miroslav Lichvar <mlichvar0@gmail.com>
---
 net/chrony/files/chrony.conf  |  3 ++-
 net/chrony/files/chronyd.init | 11 +++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/chrony/files/chrony.conf b/net/chrony/files/chrony.conf
index 410e63b94..4ad195c3e 100644
--- a/net/chrony/files/chrony.conf
+++ b/net/chrony/files/chrony.conf
@@ -1,4 +1,5 @@
-# This file is included from config file generated from /etc/config/chrony
+# Load UCI configuration
+confdir /var/etc/chrony.d
 
 # Log clock errors above 0.5 seconds
 logchange 0.5
diff --git a/net/chrony/files/chronyd.init b/net/chrony/files/chronyd.init
index 492f755ff..42b052d8b 100644
--- a/net/chrony/files/chronyd.init
+++ b/net/chrony/files/chronyd.init
@@ -4,8 +4,8 @@
 START=15
 USE_PROCD=1
 PROG=/usr/sbin/chronyd
-CONFIGFILE=/var/etc/chrony.conf
-INCLUDEFILE=/etc/chrony/chrony.conf
+CONFIGFILE=/etc/chrony/chrony.conf
+INCLUDEFILE=/var/etc/chrony.d/10-uci.conf
 
 handle_source() {
 	local cfg=$1 sourcetype=$2 hostname minpoll maxpoll iburst
@@ -57,20 +57,19 @@ start_service() {
 	. /lib/functions/network.sh
 
 	procd_open_instance
-	procd_set_param command $PROG -n -f $CONFIGFILE
+	procd_set_param command $PROG -n
 	procd_set_param file $CONFIGFILE
 	procd_set_param file $INCLUDEFILE
 	procd_close_instance
 
 	config_load chrony
-	mkdir -p $(dirname $CONFIGFILE)
+	mkdir -p $(dirname $INCLUDEFILE)
 
 	(
-		echo include $INCLUDEFILE
 		config_foreach handle_source server server
 		config_foreach handle_source pool pool
 		config_foreach handle_source peer peer
 		config_foreach handle_allow allow
 		config_foreach handle_makestep makestep
-	) > $CONFIGFILE
+	) > $INCLUDEFILE
 }