svn commit: r305165 - in stable: 10/sbin/resolvconf 11/sbin/resolvconf

[Eric Badger]

Author: badger
Date: Wed Aug 31 22:18:50 2016
New Revision: 305165
URL: https://svnweb.freebsd.org/changeset/base/305165

Log:
  MFC r304652:
  
  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.
  
  Approved by:	vangyzen (mentor)
  Sponsored by:	Dell Inc.

Modified:
  stable/10/sbin/resolvconf/Makefile
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/11/sbin/resolvconf/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/sbin/resolvconf/Makefile
==============================================================================
--- stable/10/sbin/resolvconf/Makefile	Wed Aug 31 21:48:22 2016	(r305164)
+++ stable/10/sbin/resolvconf/Makefile	Wed Aug 31 22:18:50 2016	(r305165)
@@ -15,6 +15,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.
@@ -24,12 +25,12 @@ 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}:g' \
 		-e 's:@RCDIR@:${RCDIR}:g' \
+		-e 's:@SBINDIR@:${SBINDIR}:g' \
 		-e 's: vpn : ng[0-9]*&:g' \
 		${DIST}/$@.in > $@
 .endfor