svn commit: r313160 - head/sbin/resolvconf

[Pedro F. Giffuni]

Author: pfg
Date: Fri Feb  3 16:08:58 2017
New Revision: 313160
URL: https://svnweb.freebsd.org/changeset/base/313160

Log:
  resolvconf: restore RESTARTCMD=, CMD1=, CMD2= and sed pattern as before.
  
  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.
  
  Submitted by:	Guy Yur
  x_MFC with:	r312992

Modified:
  head/sbin/resolvconf/Makefile

Modified: head/sbin/resolvconf/Makefile
==============================================================================
--- head/sbin/resolvconf/Makefile	Fri Feb  3 13:07:24 2017	(r313159)
+++ head/sbin/resolvconf/Makefile	Fri Feb  3 16:08:58 2017	(r313160)
@@ -20,16 +20,16 @@ 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.
-CMD1=		\1 onestatus >/dev/null 2>\&1
-CMD2=		\1 restart
-RESTARTCMD=	/usr/sbin/service ${CMD1} \&\& /usr/sbin/service ${CMD2}
+CMD1=		\\$$1 onestatus >/dev/null 2>\&1
+CMD2=		\\$$1 restart
+RESTARTCMD=	"/usr/sbin/service ${CMD1} \&\& /usr/sbin/service ${CMD2}"
 
 .for f in ${SCRIPTS} ${FILES} ${MAN}
 ${f}:	${f}.in
 	sed	-e 's:@SYSCONFDIR@:${SYSCONFDIR}:g' \
 		-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:@SBINDIR@:${SBINDIR}:g' \
 		-e 's: vpn : ng[0-9]*&:g' \