Date: Sat, 30 Jul 2016 20:40:02 -0500 From: Pedro Giffuni <pfg@FreeBSD.org> To: Guy Yur <guyyur@gmail.com>, freebsd-current <freebsd-current@freebsd.org> Cc: Glen Barber <gjb@FreeBSD.org> Subject: Re: resolvconf needs @RESTARTCMD@ to be replaced after r303062 Message-ID: <ec770c15-8b61-2136-4da4-37f005d89ea0@FreeBSD.org> In-Reply-To: <CAC67Hz_1wc9ddh1RmY-T96=sBH8=du6SJru3zGQZHgjjpivLCw@mail.gmail.com> References: <CAC67Hz_1wc9ddh1RmY-T96=sBH8=du6SJru3zGQZHgjjpivLCw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------7C20F263BA11AFA65996691B Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit (CC'ing Glen for review, since he was the last to touch that file and may know better). 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@. > 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. Pedro. --------------7C20F263BA11AFA65996691B Content-Type: text/x-patch; name="resolvconf-restartcmd.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="resolvconf-restartcmd.diff" 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 > $@ --------------7C20F263BA11AFA65996691B--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?ec770c15-8b61-2136-4da4-37f005d89ea0>