Date: Sun, 31 Jul 2016 02:35:50 +0000 From: Glen Barber <gjb@FreeBSD.org> To: Pedro Giffuni <pfg@FreeBSD.org> Cc: Guy Yur <guyyur@gmail.com>, freebsd-current <freebsd-current@freebsd.org> Subject: Re: resolvconf needs @RESTARTCMD@ to be replaced after r303062 Message-ID: <20160731023550.GF1532@FreeBSD.org> In-Reply-To: <ec770c15-8b61-2136-4da4-37f005d89ea0@FreeBSD.org> References: <CAC67Hz_1wc9ddh1RmY-T96=sBH8=du6SJru3zGQZHgjjpivLCw@mail.gmail.com> <ec770c15-8b61-2136-4da4-37f005d89ea0@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--DEfZqDS1MPR2ysog Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable 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). >=20 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; >=20 >=20 > On 07/30/16 17:37, Guy Yur wrote: > >Hi, > > > >openresolv 3.8.1 added RESTARTCMD=3D@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@. > > >=20 > I see, you mean here: >=20 > https://svnweb.freebsd.org/base/head/sbin/resolvconf/Makefile?revision=3D= 298107&view=3Dmarkup#l32 >=20 > >The following worked for me: > >RESTARTCMD_=3D "/usr/sbin/service \\$$1 onestatus >/dev/null 2>\&1 > >\&\& /usr/sbin/service \\$$1 restart" > > > >sed ... \ > > ... \ > > -e 's:@RESTARTCMD@:${RESTARTCMD_}:g' \ > > ... >=20 > And perhaps something like the attached patch (is the underscore > a typo?). >=20 > I don't see the error message though. so I need some confirmation that > this fixes the issue. >=20 Likewise, I do not see the error either, so would like definitive confirmation the patch resolves the issue. > Index: sbin/resolvconf/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > --- 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 --DEfZqDS1MPR2ysog Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJXnWQBAAoJEAMUWKVHj+KTQRwQAJ17DQbplXtfec6QUC0C+mGH 3zxX29MJ3+g7A8fJm7YlV32yU0IM8XPpoMZYCowMSMbqeH9aU0Qn6b9jYX4uJ3GX QlKoCP/HQ2rteIb7rbKJeOuFiaCNqH1UhrtO6kDNzlhwGrABlVWDRscgE3IsRVA4 rVPxGA20NAAXbR24wd5Bk9AZaZjZxKAb8S8He+fUJJJnGRZZUs4Ysv/cdbIw09UL 62J8HHttowT116ws7KjVsqcv+ua8SHGcKcV837KizGuzBXci2DaWzGwMPhXTzeJY 1Mw2kN50FCleRtcDtjCEuLwDA6F/v5kzbKnsBsb8n1USdGYbk8Aj5PAxDvLYP4CR o0bDhTARF3LUx9VeJljiDDPvgFIkk5l9oROxt6j5hQs/lzVeLbc6EW+nEiTK4Toj WFPdvEFkxi3jOMHsYCoN5Q4lXxTcMsE6Wy6VMIMFy/2Ikd5Qutzo/t/SBTo6SQKE HDFlz/P0MuoGAhsQGC7ZbwDNrVqXOFbMJxfPOnC9C/yfc1leP1obDWP4rIT1WZ5l XHTEClyz5hAQGvpT55r2WJwKzdme/7/YWxIrEl0KYI0EorJEXksELqMxjXuSir/E fnLWmC4Qz20bOwsPDj6JNdzQ6dWlqDbadXHvqwNADMw6r311q5Kuye2LugRWT4sM HMRM5gEcYOHABxEnIQuJ =MEzA -----END PGP SIGNATURE----- --DEfZqDS1MPR2ysog--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20160731023550.GF1532>