[oe] [meta-networking][PATCH] dnsmasq: steal resolvconf support from Ubuntu

[Mark Asselstine]

On Wed, Apr 6, 2016 at 9:01 AM, Anders Darander <anders at chargestorm.se> wrote:
> Hm, unfortunately I didn't notice before this went in.
>
> * Jens Rehsack <rehsack at gmail.com> [160228 13:35]:
>
>> Add support for resolvconf integration as done in Ubuntu. This implies
>> updates of start-scripts, resolvconf plugin (on nameserver update ...),
>> populate-volatiles control file for saved nameserver list.
>
>> Signed-off-by: Jens Rehsack <sno at netbsd.org>
>> ---
>
> snip...
>
>> diff --git a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service
>> index 549e15e..c3637e1 100644
>> --- a/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service
>> +++ b/meta-networking/recipes-support/dnsmasq/files/dnsmasq.service
>> @@ -5,8 +5,11 @@ After=network.target
>>  [Service]
>>  Type=forking
>>  PIDFile=/run/dnsmasq.pid
>> -ExecStart=/usr/bin/dnsmasq -x /run/dnsmasq.pid
>> -ExecReload=/bin/kill -HUP $(/bin/cat /run/dnsmasq.pid)
>> +ExecStartPre=/usr/sbin/dnsmasq --test
>> +ExecStart=/etc/init.d/dnsmasq systemd-exec
>> +ExecStartPost=/etc/init.d/dnsmasq systemd-start-resolvconf
>
> This breaks on systemd-only distros. On those, the init scripts gets
> removed during installation.
>
> When patching out that removal, I'm also seeing that dnsmasq dies after
> a few minuts.
>
>
> Cheers,
> Anders

This was obviously not tested with systemd. '/usr/sbin/dnsmasq' simply
doesn't exist and as Anders points out the init scripts are not
included in systemd builds. Would be great to see a fix for this. I
plan and sending something to at least get us back to working dnsmasq
with systemd builds.

Mark

>
>> +ExecStopPre=/etc/init.d/dnsmasq systemd-stop-resolvconf
>> +ExecReload=/bin/kill -HUP $MAINPID
>
>>  [Install]
>>  WantedBy=multi-user.target
>
> --
> Anders Darander, Senior System Architect
> ChargeStorm AB / eStorm AB
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel