From 4578c8d659f1affd76bea36593dbceda1099d105 Mon Sep 17 00:00:00 2001
From: Miroslav Lichvar <mlichvar@redhat.com>
Date: Wed, 26 Aug 2020 09:30:32 +0200
Subject: [PATCH] move default paths in /var/run to /run

---
 chrony-nm-dispatcher-dhcp.patch | 12 ++++++++++++
 chrony.spec                     |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/chrony-nm-dispatcher-dhcp.patch b/chrony-nm-dispatcher-dhcp.patch
index b183f5c..afb56cf 100644
--- a/chrony-nm-dispatcher-dhcp.patch
+++ b/chrony-nm-dispatcher-dhcp.patch
@@ -50,3 +50,15 @@ index 6ea4c37..878e72f 100644
 -- 
 2.26.2
 
+diff -up chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp.nm-dispatcher-dhcp chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp
+--- chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp.nm-dispatcher-dhcp	2020-08-26 09:27:47.076282468 +0200
++++ chrony-4.0-pre3/examples/chrony.nm-dispatcher.dhcp	2020-08-26 09:27:51.847297974 +0200
+@@ -16,7 +16,7 @@ action=$2
+ 
+ chronyc=/usr/bin/chronyc
+ default_server_options=iburst
+-server_dir=/var/run/chrony-dhcp
++server_dir=/run/chrony-dhcp
+ 
+ dhcp_server_file=$server_dir/$interface.sources
+ # DHCP4_NTP_SERVERS is passed from DHCP options by NetworkManager.
diff --git a/chrony.spec b/chrony.spec
index c3580fa..be54d76 100644
--- a/chrony.spec
+++ b/chrony.spec
@@ -66,7 +66,7 @@ md5sum -c <<-EOF | (! grep -v 'OK$')
         dcad37a5f1aae2d2ea7b935f279e0eca  examples/chrony.conf.example2
         96999221eeef476bd49fe97b97503126  examples/chrony.keys.example
         6a3178c4670de7de393d9365e2793740  examples/chrony.logrotate
-        63aa1412fd9044bde26475e4a9770fbf  examples/chrony.nm-dispatcher.dhcp
+        e051740bb4b21e2e12e6dc63f5195c48  examples/chrony.nm-dispatcher.dhcp
         8f5a98fcb400a482d355b929d04b5518  examples/chrony.nm-dispatcher.onoffline
         32c34c995c59fd1c3ad1616d063ae4a0  examples/chronyd.service
 EOF
@@ -103,10 +103,12 @@ mv clknetsim-%{clknetsim_ver}* test/simulation/clknetsim
         --enable-ntp-signd \
         --enable-scfilter \
 %{!?with_nts: --disable-nts} \
+        --chronyrundir=/run/chrony \
         --docdir=%{_docdir} \
         --with-ntp-era=$(date -d '1970-01-01 00:00:00+00:00' +'%s') \
         --with-user=chrony \
         --with-hwclockfile=%{_sysconfdir}/adjtime \
+        --with-pidfile=/run/chrony/chronyd.pid \
         --with-sendmail=%{_sbindir}/sendmail
 %make_build