resolvconf needs @RESTARTCMD@ to be replaced after r303062

[Guy Yur]

On Sun, Jul 31, 2016 at 5:46 AM, Pedro Giffuni <pfg at freebsd.org> wrote:
>
>
>>> Index: sbin/resolvconf/Makefile
>>> ===================================================================
>>> --- sbin/resolvconf/Makefile    (revision 303557)
>>> +++ sbin/resolvconf/Makefile    (working copy)
>>> @@ -30,6 +30,7 @@
>>>                 -e 's:@LIBEXECDIR@:${FILESDIR}:g' \
>>>                 -e 's:@VARDIR@:${VARDIR}:g' \
>>>                 -e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD}:g' \
>>> +               -e 's:@RESTARTCMD@:${RESTARTCMD}:g' \
>>>                 -e 's:@RCDIR@:${RCDIR}:g' \
>>>                 -e 's: vpn : ng[0-9]*&:g' \
>>>                 ${DIST}/$@.in > $@
>>
>>
>
> And the underscore was not a typo.
> Thanks Guy!
>
> Pedro.

Hi,

I meant for the RESTARTCMD_= statement to be added too.
I should have sent a patch file.

Issue could be seen during boot if using dhcpcd which invokes resolvconf
or by running 'resolvconf -r SERVICENAME'

With r303567, RESTARTCMD is now empty in the script so
dynamic detection for service command is done.

Attaching new patch.

1.
Renaming RESTARTCMD, CMD1, CMD2 to _WITH_ARG since it is only
used by pdns_recursor.in.
The other files have all moved to use $RESTARTCMD passed from resolvconf.

I will send a patch upstream to do the same for pdns_recursor.in.
The ugly _WITH_ARG vars can be removed when pdns_recursor.in
is updated to new style.

2.
Renaming RESTARTCMD_ to RESTARTCMD and adding the lines for
new CMD1, CMD2, RESTARTCMD statements.


Thanks,
Guy
-------------- next part --------------
A non-text attachment was scrubbed...
Name: resolvconf_RESTARTCMD.patch
Type: application/octet-stream
Size: 1220 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20160731/655560ab/attachment.obj>