resolvconf needs @RESTARTCMD@ to be replaced after r303062
Glen Barber
gjb at FreeBSD.org
Sun Jul 31 02:35:52 UTC 2016
On Sat, Jul 30, 2016 at 08:40:02PM -0500, Pedro Giffuni wrote:
> (CC'ing Glen for review, since he was the last to touch that file and
> may know better).
>
Unfortunately, I don't know better. I only touched the file last in
order to close a PR prior to the final 10.2-RELEASE (if I remember
correctly).
> Hi Guy;
>
>
> On 07/30/16 17:37, Guy Yur wrote:
> >Hi,
> >
> >openresolv 3.8.1 added RESTARTCMD=@RESTARTCMD@ in
> >contrib/openresolv/resolvconf.in.
> >It is not replaced by the sed expressions in sbin/resolvconf/Makefile.
> >
> >Error seen is "eval: @RESTARTCMD@: not found".
> >
> >Current @RESTARTCMD \(.*\)@ sed expression needs to be kept for
> >pdns_recursor.in and a new expression added to replace @RESTARTCMD at .
> >
>
> I see, you mean here:
>
> https://svnweb.freebsd.org/base/head/sbin/resolvconf/Makefile?revision=298107&view=markup#l32
>
> >The following worked for me:
> >RESTARTCMD_= "/usr/sbin/service \\$$1 onestatus >/dev/null 2>\&1
> >\&\& /usr/sbin/service \\$$1 restart"
> >
> >sed ... \
> > ... \
> > -e 's:@RESTARTCMD@:${RESTARTCMD_}:g' \
> > ...
>
> And perhaps something like the attached patch (is the underscore
> a typo?).
>
> I don't see the error message though. so I need some confirmation that
> this fixes the issue.
>
Likewise, I do not see the error either, so would like definitive
confirmation the patch resolves the issue.
> 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 > $@
Glen
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/freebsd-current/attachments/20160731/b24993a0/attachment.sig>
More information about the freebsd-current
mailing list