From 184e24b7f0a2ead380703f98822b3fb2d35bef28 Mon Sep 17 00:00:00 2001
From: John Estabrook <jestabro@vyos.io>
Date: Thu, 24 Oct 2024 10:50:34 -0500
Subject: vyconf: T6718: start vyconfd from vyos-router

Start vyconfd after migration.
---
 src/init/vyos-router        |  4 ++++
 src/systemd/vyconfd.service | 21 +++++++++++++++++++++
 2 files changed, 25 insertions(+)
 create mode 100644 src/systemd/vyconfd.service

diff --git a/src/init/vyos-router b/src/init/vyos-router
index 9325095c1..e2e964656 100755
--- a/src/init/vyos-router
+++ b/src/init/vyos-router
@@ -528,6 +528,8 @@ start ()
 
     disabled system_config || system_config
 
+    systemctl start vyconfd.service
+
     for s in ${subinit[@]} ; do
     if ! disabled $s; then
         log_progress_msg $s
@@ -570,6 +572,8 @@ stop()
     umount ${vyatta_configdir}
     log_action_end_msg $?
 
+    systemctl stop vyconfd.service
+
     systemctl stop frr.service
 
     unmount_encrypted_config
diff --git a/src/systemd/vyconfd.service b/src/systemd/vyconfd.service
new file mode 100644
index 000000000..b20e831ab
--- /dev/null
+++ b/src/systemd/vyconfd.service
@@ -0,0 +1,21 @@
+[Unit]
+Description=VyOS vyconf daemon
+
+# Without this option, lots of default dependencies are added,
+# among them network.target, which creates a dependency cycle
+DefaultDependencies=no
+
+After=systemd-remount-fs.service
+
+[Service]
+ExecStart=/usr/libexec/vyos/vyconf/vyconfd
+Type=exec
+SyslogIdentifier=vyconfd
+SyslogFacility=daemon
+Restart=on-failure
+
+User=root
+Group=vyattacfg
+
+[Install]
+WantedBy=vyos.target
-- 
cgit v1.2.3