From owner-svn-src-all@freebsd.org  Tue Aug 23 02:06:21 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@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 BBA84BC141D;
 Tue, 23 Aug 2016 02:06:21 +0000 (UTC)
 (envelope-from badger@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8E83A1D55;
 Tue, 23 Aug 2016 02:06:21 +0000 (UTC)
 (envelope-from badger@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u7N26KKf028738;
 Tue, 23 Aug 2016 02:06:20 GMT (envelope-from badger@FreeBSD.org)
Received: (from badger@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u7N26KK3028737;
 Tue, 23 Aug 2016 02:06:20 GMT (envelope-from badger@FreeBSD.org)
Message-Id: <201608230206.u7N26KK3028737@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: badger set sender to
 badger@FreeBSD.org using -f
From: Eric Badger <badger@FreeBSD.org>
Date: Tue, 23 Aug 2016 02:06:20 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r304652 - head/sbin/resolvconf
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Aug 2016 02:06:21 -0000

Author: badger
Date: Tue Aug 23 02:06:20 2016
New Revision: 304652
URL: https://svnweb.freebsd.org/changeset/base/304652

Log:
  Fix missing substitution of @SBINDIR@ in resolvconf scripts
  
  Certain features, such as resolv_conf_passthrough=NULL, do not work
  correctly due to this missing substitution.
  
  Also remove the @PREFIX@ substitution, which is no longer needed.
  
  Reviewed by:	pfg
  Approved by:	vangyzen (mentor)
  MFC after:	1 week
  Sponsored by:	Dell Inc.
  Differential Revision:	https://reviews.freebsd.org/D7572

Modified:
  head/sbin/resolvconf/Makefile

Modified: head/sbin/resolvconf/Makefile
==============================================================================
--- head/sbin/resolvconf/Makefile	Tue Aug 23 01:58:02 2016	(r304651)
+++ head/sbin/resolvconf/Makefile	Tue Aug 23 02:06:20 2016	(r304652)
@@ -16,6 +16,7 @@ CLEANFILES=	${SCRIPTS} ${FILES} ${MAN}
 SYSCONFDIR=	/etc
 RCDIR=		${SYSCONFDIR}/rc.d
 VARDIR=		/var/run/resolvconf
+SBINDIR=	/sbin
 
 # We don't assume to restart the services in /sbin.  So, though
 # our service(8) is in /usr/sbin, we can use it, here.
@@ -28,13 +29,13 @@ RESTARTCMD=	"/usr/sbin/service ${CMD1} \
 
 .for f in ${SCRIPTS} ${FILES} ${MAN}
 ${f}:	${f}.in
-	sed -e 's:@PREFIX@::g' \
-		-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \
+	sed	-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \
 		-e 's:@LIBEXECDIR@:${FILESDIR}:g' \
 		-e 's:@VARDIR@:${VARDIR}:g' \
 		-e 's:@RESTARTCMD \(.*\)@:${RESTARTCMD_WITH_ARG}:g' \
 		-e 's:@RESTARTCMD@:${RESTARTCMD}:g' \
 		-e 's:@RCDIR@:${RCDIR}:g' \
+		-e 's:@SBINDIR@:${SBINDIR}:g' \
 		-e 's: vpn : ng[0-9]*&:g' \
 		${DIST}/$@.in > $@
 .endfor