d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolvconf: restore RESTARTCMD=, CMD1=, CMD2= and sed pattern as before.

Browse Source 
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
This commit is contained in:
Pedro F. Giffuni 2017-02-03 16:08:58 +00:00
parent 57f6622f92
commit 0157503dd8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=313160
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sbin/resolvconf/Makefile
View File

@ -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' \