Date: Sun, 31 Jul 2016 19:56:26 +0300 From: Guy Yur <guyyur@gmail.com> To: Pedro Giffuni <pfg@freebsd.org> Cc: Glen Barber <gjb@freebsd.org>, freebsd-current <freebsd-current@freebsd.org> Subject: Re: resolvconf needs @RESTARTCMD@ to be replaced after r303062 Message-ID: <CAC67Hz-ZbKAxNY_STe6An2SFfEBA_UnGH8XCZ=RKkM-m%2B__0=Q@mail.gmail.com> In-Reply-To: <a5a5b0ca-41bc-d313-1f0a-1114ad8e5ccc@FreeBSD.org> References: <CAC67Hz_1wc9ddh1RmY-T96=sBH8=du6SJru3zGQZHgjjpivLCw@mail.gmail.com> <ec770c15-8b61-2136-4da4-37f005d89ea0@FreeBSD.org> <20160731023550.GF1532@FreeBSD.org> <a5a5b0ca-41bc-d313-1f0a-1114ad8e5ccc@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--089e0103e05c4ca9100538f15d69
Content-Type: text/plain; charset=UTF-8
On Sun, Jul 31, 2016 at 5:46 AM, Pedro Giffuni <pfg@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
--089e0103e05c4ca9100538f15d69
Content-Type: application/octet-stream; name="resolvconf_RESTARTCMD.patch"
Content-Disposition: attachment; filename="resolvconf_RESTARTCMD.patch"
Content-Transfer-Encoding: base64
X-Attachment-Id: f_iraudptw0
SW5kZXg6IE1ha2VmaWxlCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIE1ha2VmaWxlCShyZXZpc2lvbiAzMDM1OTEp
CisrKyBNYWtlZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMTksOSArMTksMTIgQEAgVkFSRElSPQkJ
L3Zhci9ydW4vcmVzb2x2Y29uZgogCiAjIFdlIGRvbid0IGFzc3VtZSB0byByZXN0YXJ0IHRoZSBz
ZXJ2aWNlcyBpbiAvc2Jpbi4gIFNvLCB0aG91Z2gKICMgb3VyIHNlcnZpY2UoOCkgaXMgaW4gL3Vz
ci9zYmluLCB3ZSBjYW4gdXNlIGl0LCBoZXJlLgotQ01EMT0JCVwxIG9uZXN0YXR1cyA+L2Rldi9u
dWxsIDI+XCYxCi1DTUQyPQkJXDEgcmVzdGFydAotUkVTVEFSVENNRD0JL3Vzci9zYmluL3NlcnZp
Y2UgJHtDTUQxfSBcJlwmIC91c3Ivc2Jpbi9zZXJ2aWNlICR7Q01EMn0KK0NNRDFfV0lUSF9BUkc9
CQlcMSBvbmVzdGF0dXMgPi9kZXYvbnVsbCAyPlwmMQorQ01EMl9XSVRIX0FSRz0JCVwxIHJlc3Rh
cnQKK1JFU1RBUlRDTURfV0lUSF9BUkc9CS91c3Ivc2Jpbi9zZXJ2aWNlICR7Q01EMV9XSVRIX0FS
R30gXCZcJiAvdXNyL3NiaW4vc2VydmljZSAke0NNRDJfV0lUSF9BUkd9CitDTUQxPQkJXFwkJDEg
b25lc3RhdHVzID4vZGV2L251bGwgMj5cJjEKK0NNRDI9CQlcXCQkMSByZXN0YXJ0CitSRVNUQVJU
Q01EPQkiL3Vzci9zYmluL3NlcnZpY2UgJHtDTUQxfSBcJlwmIC91c3Ivc2Jpbi9zZXJ2aWNlICR7
Q01EMn0iCiAKIC5mb3IgZiBpbiAke1NDUklQVFN9ICR7RklMRVN9ICR7TUFOfQogJHtmfToJJHtm
fS5pbgpAQCAtMjksOCArMzIsOCBAQCAke2Z9Ogkke2Z9LmluCiAJCS1lICdzOkBTWVNDT05GRElS
QDoke1NZU0NPTkZESVJ9OmcnIFwKIAkJLWUgJ3M6QExJQkVYRUNESVJAOiR7RklMRVNESVJ9Omcn
IFwKIAkJLWUgJ3M6QFZBUkRJUkA6JHtWQVJESVJ9OmcnIFwKLQkJLWUgJ3M6QFJFU1RBUlRDTUQg
XCguKlwpQDoke1JFU1RBUlRDTUR9OmcnIFwKLQkJLWUgJ3M6QFJFU1RBUlRDTURAOiR7UkVTVEFS
VENNRF99OmcnIFwKKwkJLWUgJ3M6QFJFU1RBUlRDTUQgXCguKlwpQDoke1JFU1RBUlRDTURfV0lU
SF9BUkd9OmcnIFwKKwkJLWUgJ3M6QFJFU1RBUlRDTURAOiR7UkVTVEFSVENNRH06ZycgXAogCQkt
ZSAnczpAUkNESVJAOiR7UkNESVJ9OmcnIFwKIAkJLWUgJ3M6IHZwbiA6IG5nWzAtOV0qJjpnJyBc
CiAJCSR7RElTVH0vJEAuaW4gPiAkQAo=
--089e0103e05c4ca9100538f15d69--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAC67Hz-ZbKAxNY_STe6An2SFfEBA_UnGH8XCZ=RKkM-m%2B__0=Q>