From f2e8531996042c0b2f81acffebe50ebf0a32c3f8 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Sat, 4 Jan 2025 13:17:51 -0600
Subject: ddclient: T5791: Keep ddclient.service in foreground

Since the distributed ddclient.service is of type 'exec' now, avoid using
process forking and let systemd manage the process directly.
---
 data/templates/dns-dynamic/ddclient.conf.j2 | 1 -
 data/templates/dns-dynamic/override.conf.j2 | 5 +++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/templates/dns-dynamic/ddclient.conf.j2 b/data/templates/dns-dynamic/ddclient.conf.j2
index 5538ea56c..23aad4cb8 100644
--- a/data/templates/dns-dynamic/ddclient.conf.j2
+++ b/data/templates/dns-dynamic/ddclient.conf.j2
@@ -24,7 +24,6 @@ if{{ ipv }}={{ address }}, \
 daemon={{ interval }}
 syslog=yes
 ssl=yes
-pid={{ config_file | replace('.conf', '.pid') }}
 cache={{ config_file | replace('.conf', '.cache') }}
 {# ddclient default (web=dyndns) doesn't support ssl and results in process lockup #}
 web=googledomains
diff --git a/data/templates/dns-dynamic/override.conf.j2 b/data/templates/dns-dynamic/override.conf.j2
index 4a6851cef..c0edd8f05 100644
--- a/data/templates/dns-dynamic/override.conf.j2
+++ b/data/templates/dns-dynamic/override.conf.j2
@@ -1,10 +1,11 @@
 {% set vrf_command = 'ip vrf exec ' ~ vrf ~ ' ' if vrf is vyos_defined else '' %}
 [Unit]
 ConditionPathExists={{ config_file }}
+Wants=
 After=vyos-router.service
 
 [Service]
-PIDFile={{ config_file | replace('.conf', '.pid') }}
 EnvironmentFile=
 ExecStart=
-ExecStart={{ vrf_command }}/usr/bin/ddclient -file {{ config_file }}
+ExecStart={{ vrf_command }}/usr/bin/ddclient --file {{ config_file }} --foreground
+Restart=always
-- 
cgit v1.2.3