From fd2d4528b95b96894c5dd3b462d7f47f530f4e41 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Sat, 4 Jan 2025 13:17:51 -0600
Subject: [PATCH] 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 | 2 +-
 data/templates/dns-dynamic/override.conf.j2 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/data/templates/dns-dynamic/ddclient.conf.j2 b/data/templates/dns-dynamic/ddclient.conf.j2
index 5538ea56ca..93addec696 100644
--- a/data/templates/dns-dynamic/ddclient.conf.j2
+++ b/data/templates/dns-dynamic/ddclient.conf.j2
@@ -22,9 +22,9 @@ if{{ ipv }}={{ address }}, \
 {% endmacro %}
 ### Autogenerated by service_dns_dynamic.py ###
 daemon={{ interval }}
+foreground=yes
 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 4a6851cef4..698d97d19b 100644
--- a/data/templates/dns-dynamic/override.conf.j2
+++ b/data/templates/dns-dynamic/override.conf.j2
@@ -4,7 +4,6 @@ ConditionPathExists={{ config_file }}
 After=vyos-router.service
 
 [Service]
-PIDFile={{ config_file | replace('.conf', '.pid') }}
 EnvironmentFile=
 ExecStart=
 ExecStart={{ vrf_command }}/usr/bin/ddclient -file {{ config_file }}