aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMario Schuknecht <mario.schuknecht@dresearch-fe.de>2021-01-25 18:09:19 +0100
committerArmin Kuster <akuster808@gmail.com>2021-02-09 08:49:07 -0800
commit83842c9150fdead52dc7b0913ffac32677720f98 (patch)
treea971844c9b30e8e47d0ad3c530f9b14272ba9b78
parent1de0f4c33b92b9bbd885044df505154c177db59e (diff)
downloadmeta-openembedded-contrib-83842c9150fdead52dc7b0913ffac32677720f98.tar.gz
meta-openembedded-contrib-83842c9150fdead52dc7b0913ffac32677720f98.tar.bz2
meta-openembedded-contrib-83842c9150fdead52dc7b0913ffac32677720f98.zip
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 <mario.schuknecht@dresearch-fe.de> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 55c94cb3196f53d0c1c76bbd74136d1b5d51802d) Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-networking/recipes-support/dnsmasq/files/dnsmasq-resolvconf.service2
1 files changed, 1 insertions, 1 deletions
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