From owner-freebsd-current@freebsd.org Sun Jul 31 16:56:29 2016 Return-Path: Delivered-To: freebsd-current@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 488E3BA9202 for ; Sun, 31 Jul 2016 16:56:29 +0000 (UTC) (envelope-from guyyur@gmail.com) Received: from mail-wm0-x22d.google.com (mail-wm0-x22d.google.com [IPv6:2a00:1450:400c:c09::22d]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 0389A19FB; Sun, 31 Jul 2016 16:56:28 +0000 (UTC) (envelope-from guyyur@gmail.com) Received: by mail-wm0-x22d.google.com with SMTP id o80so213651215wme.1; Sun, 31 Jul 2016 09:56:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=iVdIs5byTn+8A+2e6naVK9xReObYoiTjIO1BFC1zBNE=; b=XQzewAgkfEAJ0Vn4ydwRcNc9T7EeiZNaoxvkUcWFpV7K3ddz+Gb0PAR3UQ65DoF1f8 d1ODnR+JM8YTMR2Rkxch0CfeXAOheRHG63t3v0bRnP4m4UuablkUcVzbgqjlUWtOFHi+ 2CMgjpV9bojGdTS3gKCUFw/5lTXtc/+O/0iE6Bm5qo8Y+hiC/Rb1+IwOoRBULJmHdULm Dry8yzOv+DUJKeJKpHpeL9QOlMcc62xjHMYYOLLDPDskZvAok7qMApV+Na+s4E4nHKlW n04PV66SIPmUGmIGW9cyNMEcuuSQ8U3autYxUZpPqghkaUM4YR31KjH3Ale2luh/9UPH QsgA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=iVdIs5byTn+8A+2e6naVK9xReObYoiTjIO1BFC1zBNE=; b=k3y2hSzG1sprgmTGAssYr7H+6CPqfhhwY3gRsrdRaaREjn9r6B+ofbMVfy6f2RlEYH /7eWe9m0zM9kVxSoWLq1prj8YzQmguCTaX6CY1VzeMM2w0VYcmZczt3IMfD5J1VN2CzF hFNsHy7+Xk9tp0oNHd9bdKmExgIwzneO1Jht/04y7liTTFR0Ue05Dh4v3OYMKUEIrKSU cwQCLMzvpfM/V4YgcPMSba+ZGXsXySHeIEGriltV/F/tIifzIRjTMILkYkGxlJGdwd40 gVaPFHddkBEbowEkxYaevrTT9Ee1vXMYgiK7qIfjjTL8XbBUogITkw62lS8SR+gnknfz qUOQ== X-Gm-Message-State: AEkoouudTq80KcQx6BCujQNJSNKpu6kPzQfvdXMhuU9CRlvEXS/0csinqSWhOedJkWMAxSH9U4rOhJXWYo42CA== X-Received: by 10.194.85.18 with SMTP id d18mr47124671wjz.43.1469984187122; Sun, 31 Jul 2016 09:56:27 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.19.203 with HTTP; Sun, 31 Jul 2016 09:56:26 -0700 (PDT) In-Reply-To: References: <20160731023550.GF1532@FreeBSD.org> From: Guy Yur Date: Sun, 31 Jul 2016 19:56:26 +0300 Message-ID: Subject: Re: resolvconf needs @RESTARTCMD@ to be replaced after r303062 To: Pedro Giffuni Cc: Glen Barber , freebsd-current Content-Type: multipart/mixed; boundary=089e0103e05c4ca9100538f15d69 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Jul 2016 16:56:29 -0000 --089e0103e05c4ca9100538f15d69 Content-Type: text/plain; charset=UTF-8 On Sun, Jul 31, 2016 at 5:46 AM, Pedro Giffuni 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--