From owner-freebsd-current@freebsd.org Fri Feb 3 08:24:38 2017 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 C1711CCDF0C for ; Fri, 3 Feb 2017 08:24:38 +0000 (UTC) (envelope-from guyyur@gmail.com) Received: from mail-wm0-x232.google.com (mail-wm0-x232.google.com [IPv6:2a00:1450:400c:c09::232]) (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 69D0138E; Fri, 3 Feb 2017 08:24:38 +0000 (UTC) (envelope-from guyyur@gmail.com) Received: by mail-wm0-x232.google.com with SMTP id c85so16601579wmi.1; Fri, 03 Feb 2017 00:24:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=2umMVZ9+iSlefLvBRKcasTZuepgUiEhCxYPiiVRk9pQ=; b=qFw1U92ihhrD0j9s2iZzN6vFRpAL6htB93cXOJMTHbRRrRFoTNndu+iqRhaZMRVj3O 7tzpEs2Xh1g2nXSDN6hzpn1zii/uwY8oT7z8eyLrAttao3TkSKjKHgPhOmRVxK3YFmaR L0qZM7xfFz4iGlh1rmVhNB22QmR8CWNSJ+DNJJb/Y6jakTV3Emd3tJheSEom394JTsNe EoU8HDFUMGDX/UgmNfbCLE5v/CJM5sZ9rA/8mIenRmzwk8h/5gH2Q1/vVkPUomNpLLtl 3P00FmgvVMOTnIjpWTHhRT9ZCkSHwu30eq66mpKHAJ/7E0ZfLFzV4o7m8qlx+0rkD2I3 94Dg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=2umMVZ9+iSlefLvBRKcasTZuepgUiEhCxYPiiVRk9pQ=; b=rBuoW+fN6or8TGQYdX6VsTgXa2L/RHPYiEl32uHFym/wbLUsi4r3ZtD5gI4X/1MuM0 ErH6m8PbRJjFsKBIrFQL+tMmy+8YCHQVcxIUbsvAUaOxPEElkz54Gd8hj/C9pNiHMWWH Bk5ta3V6TlJSpXp3mtOq8oUEYsAQSw+TQBg9wEplif6mN0JOV7+f3uVJlnzhTUFSZ1o9 M3Os8wdqPAqgrcw+qtQrU8LkI3/cpQOc1GnOvqKUrOG5vD3wWgXoJlCU1DsSHFV9/UDZ b7qPDhwM2Gs2A+3ObsDXl8kXbeP8/nwb/8QoGcTDaG+Ca1J2DKjl1stRnmAdzwsNMkiZ 0Kxw== X-Gm-Message-State: AMke39lQocQ6fH1CDH5qhGMQS3jn4pazLQnpaSWqgf211wW1fDu0wrFIkxiYTuBx41ibhe9rBOZxGXAuFXf6Sg== X-Received: by 10.28.111.78 with SMTP id k75mr250577wmc.71.1486110276683; Fri, 03 Feb 2017 00:24:36 -0800 (PST) MIME-Version: 1.0 Received: by 10.28.24.6 with HTTP; Fri, 3 Feb 2017 00:24:35 -0800 (PST) From: Guy Yur Date: Fri, 3 Feb 2017 10:24:35 +0200 Message-ID: Subject: resolvconf Makefile RESTARTCMD sed after r312992 To: Pedro Giffuni , freebsd-current Content-Type: multipart/mixed; boundary=001a1147df4023b05505479c0385 X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.23 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: Fri, 03 Feb 2017 08:24:38 -0000 --001a1147df4023b05505479c0385 Content-Type: text/plain; charset=UTF-8 Hi, In openresolv 3.9.0, the only RESTARTCMD pattern left is @RESTARTCMD@. The '@RESTARTCMD something@' pattern was dropped from pdns_recursor.in. r312992 removed RESTARTCMD_WITH_ARG for @RESTARTCMD something@ but reverted the sed to be '@RESTARTCMD \(.*\)@' and RESTARTCMD= to be the value of RESTARTCMD_WITH_ARG. After the change /sbin/resolvconf has 'RESTARTCMD=@RESTARTCMD@' again. Attaching patch to restore RESTARTCMD=, CMD1=, CMD2= and sed pattern to values before r312992. Thanks, Guy --001a1147df4023b05505479c0385 Content-Type: application/octet-stream; name="resolvconf_RESTARTCMD_sed.patch" Content-Disposition: attachment; filename="resolvconf_RESTARTCMD_sed.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_iypj4mg10 SW5kZXg6IHNiaW4vcmVzb2x2Y29uZi9NYWtlZmlsZQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBzYmluL3Jlc29s dmNvbmYvTWFrZWZpbGUJKHJldmlzaW9uIDMxMzEzNykKKysrIHNiaW4vcmVzb2x2Y29uZi9NYWtl ZmlsZQkod29ya2luZyBjb3B5KQpAQCAtMjAsOSArMjAsOSBAQCBTQklORElSPQkvc2JpbgogCiAj IFdlIGRvbid0IGFzc3VtZSB0byByZXN0YXJ0IHRoZSBzZXJ2aWNlcyBpbiAvc2Jpbi4gIFNvLCB0 aG91Z2gKICMgb3VyIHNlcnZpY2UoOCkgaXMgaW4gL3Vzci9zYmluLCB3ZSBjYW4gdXNlIGl0LCBo ZXJlLgotQ01EMT0JCVwxIG9uZXN0YXR1cyA+L2Rldi9udWxsIDI+XCYxCi1DTUQyPQkJXDEgcmVz dGFydAotUkVTVEFSVENNRD0JL3Vzci9zYmluL3NlcnZpY2UgJHtDTUQxfSBcJlwmIC91c3Ivc2Jp bi9zZXJ2aWNlICR7Q01EMn0KK0NNRDE9CQlcXCQkMSBvbmVzdGF0dXMgPi9kZXYvbnVsbCAyPlwm MQorQ01EMj0JCVxcJCQxIHJlc3RhcnQKK1JFU1RBUlRDTUQ9CSIvdXNyL3NiaW4vc2VydmljZSAk e0NNRDF9IFwmXCYgL3Vzci9zYmluL3NlcnZpY2UgJHtDTUQyfSIKIAogLmZvciBmIGluICR7U0NS SVBUU30gJHtGSUxFU30gJHtNQU59CiAke2Z9Ogkke2Z9LmluCkBAIC0yOSw3ICsyOSw3IEBAICR7 Zn06CSR7Zn0uaW4KIAlzZWQJLWUgJ3M6QFNZU0NPTkZESVJAOiR7U1lTQ09ORkRJUn06ZycgXAog CQktZSAnczpATElCRVhFQ0RJUkA6JHtGSUxFU0RJUn06ZycgXAogCQktZSAnczpAVkFSRElSQDok e1ZBUkRJUn06ZycgXAotCQktZSAnczpAUkVTVEFSVENNRCBcKC4qXClAOiR7UkVTVEFSVENNRH06 ZycgXAorCQktZSAnczpAUkVTVEFSVENNREA6JHtSRVNUQVJUQ01EfTpnJyBcCiAJCS1lICdzOkBS Q0RJUkA6JHtSQ0RJUn06ZycgXAogCQktZSAnczpAU0JJTkRJUkA6JHtTQklORElSfTpnJyBcCiAJ CS1lICdzOiB2cG4gOiBuZ1swLTldKiY6ZycgXAo= --001a1147df4023b05505479c0385--