From d6c1ba43020334f10f35e45b2ff8ca9a5bd1e81d Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonyg@leastfixedpoint.com>
Date: Mon, 7 Feb 2022 21:11:07 +0100
Subject: [PATCH] Start rearranging dependencies to avoid spurious UI restarts
 (!)

---
 .../synit-config/files/etc/syndicate/services/configdirs.pr    | 2 ++
 .../files/etc/syndicate/{core => services}/network.pr          | 0
 .../packages/synit-config/files/etc/syndicate/services/ntpd.pr | 3 +++
 packaging/packages/synit-config/files/sbin/synit-init.sh       | 2 ++
 4 files changed, 7 insertions(+)
 create mode 100644 packaging/packages/synit-config/files/etc/syndicate/services/configdirs.pr
 rename packaging/packages/synit-config/files/etc/syndicate/{core => services}/network.pr (100%)
 create mode 100644 packaging/packages/synit-config/files/etc/syndicate/services/ntpd.pr

diff --git a/packaging/packages/synit-config/files/etc/syndicate/services/configdirs.pr b/packaging/packages/synit-config/files/etc/syndicate/services/configdirs.pr
new file mode 100644
index 0000000..45fd516
--- /dev/null
+++ b/packaging/packages/synit-config/files/etc/syndicate/services/configdirs.pr
@@ -0,0 +1,2 @@
+<require-service <config-watcher "/run/etc/syndicate/services" $.>>
+<require-service <config-watcher "/usr/local/etc/syndicate/services" $.>>
diff --git a/packaging/packages/synit-config/files/etc/syndicate/core/network.pr b/packaging/packages/synit-config/files/etc/syndicate/services/network.pr
similarity index 100%
rename from packaging/packages/synit-config/files/etc/syndicate/core/network.pr
rename to packaging/packages/synit-config/files/etc/syndicate/services/network.pr
diff --git a/packaging/packages/synit-config/files/etc/syndicate/services/ntpd.pr b/packaging/packages/synit-config/files/etc/syndicate/services/ntpd.pr
new file mode 100644
index 0000000..ae42e92
--- /dev/null
+++ b/packaging/packages/synit-config/files/etc/syndicate/services/ntpd.pr
@@ -0,0 +1,3 @@
+<require-service <daemon ntpd>>
+<depends-on <daemon ntpd> <default-route ipv4>>
+<daemon ntpd "ntpd -d -n -p pool.ntp.org">
diff --git a/packaging/packages/synit-config/files/sbin/synit-init.sh b/packaging/packages/synit-config/files/sbin/synit-init.sh
index 15c41f3..05af726 100755
--- a/packaging/packages/synit-config/files/sbin/synit-init.sh
+++ b/packaging/packages/synit-config/files/sbin/synit-init.sh
@@ -22,6 +22,8 @@ mount -o rw,remount /
 
 mkdir -p /run/etc/syndicate/core
 mkdir -p /usr/local/etc/syndicate/core
+mkdir -p /run/etc/syndicate/services
+mkdir -p /usr/local/etc/syndicate/services
 
 # This is a grody hack. We are replacing the infrastructure that sets up RNDIS, and in
 # particular we no longer want to run the DHCP server that PostmarketOS runs by default on