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

resolvconf(8) now needs an additional @RESTARTCMD@ replacement when installing.

Browse Source 
After r303062, which brought openresolv 3.8.1, we need to replace an
additional @RESTARTCMD@ in resolvconf.
Apply a read fix this time.

Submitted by:	Guy Yur
X-MFC with:	r303062
This commit is contained in:
Pedro F. Giffuni 2016-07-31 18:14:42 +00:00
parent ed24579135
commit 6a88c69fe0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=303593
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
sbin/resolvconf/Makefile
View File

@ -19,9 +19,12 @@ VARDIR= /var/run/resolvconf
# 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_WITH_ARG= \1 onestatus >/dev/null 2>\&1
CMD2_WITH_ARG= \1 restart
RESTARTCMD_WITH_ARG= /usr/sbin/service ${CMD1_WITH_ARG} \&\& /usr/sbin/service ${CMD2_WITH_ARG}
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
@ -29,8 +32,8 @@ ${f}: ${f}.in
-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:@RESTARTCMD \(.*\)@:${RESTARTCMD_WITH_ARG}:g' \
-e 's:@RESTARTCMD@:${RESTARTCMD}:g' \
-e 's:@RCDIR@:${RCDIR}:g' \
-e 's: vpn : ng[0-9]*&:g' \
${DIST}/$@.in > $@