Merge pull request #4827 from jestabro/vyconfd-restart

T7980: Load active config on vyconfd restart

Author: dmbaturin

src/init/vyconfd.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# Check if state file exists to determine if restart
+if [ -f /var/run/vyconfd.state ]; then
+    echo "Restarting vyconfd from active config"
+    /usr/libexec/vyos/vyconf/vyconfd --log-file /var/run/log/vyconfd.log --reload-active-config --legacy-config-path
+else
+    echo "Starting vyconfd from saved config"
+    touch /var/run/vyconfd.state
+    /usr/libexec/vyos/vyconf/vyconfd --log-file /var/run/log/vyconfd.log --legacy-config-path
+fi

src/init/vyos-router

@@ -594,8 +594,6 @@ start ()
 
     disabled system_config || system_config || overall_status=1
 
-    systemctl start vyconfd.service
-
     for s in ${subinit[@]} ; do
         if ! disabled $s; then
             log_progress_msg $s

src/systemd/vyconfd.service

@@ -8,7 +8,7 @@ DefaultDependencies=no
 After=systemd-remount-fs.service
 
 [Service]
-ExecStart=/usr/libexec/vyos/vyconf/vyconfd --log-file /var/run/log/vyconfd.log --legacy-config-path
+ExecStart=/usr/libexec/vyos/init/vyconfd.sh
 Type=exec
 SyslogIdentifier=vyconfd
 SyslogFacility=daemon