[oe-commits] [meta-openembedded] 30/35: dnsmasq: get systemd only working again

[git at git.openembedded.org]

martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 6445a5aa7fc260140efa38e2e66986cfa02405fa
Author: Mark Asselstine <mark.asselstine at windriver.com>
AuthorDate: Mon Apr 18 16:34:36 2016 -0400

    dnsmasq: get systemd only working again
    
    The changes made in commit 2497cf2960537152427c99629b2af412787eb6c2
    [dnsmasq: steal resolvconf support from Ubuntu] broke systemd only
    dnsmasq runtime. No sysvinit scripts are included in systemd only
    builds (and should not be) and the dnsmasq executable has not moved to
    /usr/sbin.
    
    Reverting to the previous version of the systemd service file. If
    folks want the local dnsmasq instance to be queried before going to
    an external DNS they should add 'nameserver 127.0.0.1' to
    /etc/resolv.conf. Or submit a change which will work with systemd.
    
    Signed-off-by: Mark Asselstine <mark.asselstine at windriver.com>
    Acked-by: Anders Darander <anders at chargestorm.se>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-networking/recipes-support/dnsmasq/files/dnsmasq.service | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service
index c3637e1..549e15e 100644
--- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service
+++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service
@@ -5,11 +5,8 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/dnsmasq.pid
-ExecStartPre=/usr/sbin/dnsmasq --test
-ExecStart=/etc/init.d/dnsmasq systemd-exec
-ExecStartPost=/etc/init.d/dnsmasq systemd-start-resolvconf
-ExecStopPre=/etc/init.d/dnsmasq systemd-stop-resolvconf
-ExecReload=/bin/kill -HUP $MAINPID
+ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid
+ExecReload=/bin/kill -HUP $(/bin/cat /run/dnsmasq.pid)
 
 [Install]
 WantedBy=multi-user.target

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.