From 83842c9150fdead52dc7b0913ffac32677720f98 Mon Sep 17 00:00:00 2001 From: Mario Schuknecht Date: Mon, 25 Jan 2021 18:09:19 +0100 Subject: dnsmasq: Fix systemd service Systemd service file option 'ExecStopPre' is warned and ignored by systemd. By replacing 'ExecStopPre' with 'ExecStop', the intended behavior is realized. The 'ExecStop' commands are executed one after the other. Signed-off-by: Mario Schuknecht Signed-off-by: Khem Raj (cherry picked from commit 55c94cb3196f53d0c1c76bbd74136d1b5d51802d) Signed-off-by: Armin Kuster --- .../recipes-support/dnsmasq/files/dnsmasq-resolvconf.service | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service index 2980f7def6..ef2f3f7e41 100644 --- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service +++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service @@ -8,7 +8,7 @@ PIDFile=/run/dnsmasq.pid ExecStartPre=/usr/bin/dnsmasq --test ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid -7 /etc/dnsmasq.d --local-service ExecStartPost=/usr/bin/dnsmasq-resolvconf-helper start -ExecStopPre=/usr/bin/dnsmasq-resolvconf-helper stop +ExecStop=/usr/bin/dnsmasq-resolvconf-helper stop ExecStop=/bin/kill $MAINPID ExecReload=/bin/kill -HUP $MAINPID -- cgit 1.2.3-korg