dnsmasq: get systemd only working again
PATCH 1/1 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.
--- meta-networking/recipes-support/dnsmasq/files/dnsmasq.service | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
meta-networking/recipes-support/dnsmasq/files/dnsmasq.service +2 -5
@@ -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
Signature · 1 line
2.1.4
Quoted 6 lines · Mark Asselstine
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.
Quoted 7 lines
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 <[email protected]>---
Signature · 2 lines
Anders Darander, Senior System Architect ChargeStorm AB / eStorm AB