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
This commit is contained in:
parent
16c2e36059
commit
6ff6aea629
@ -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} \&\& /usr/sbin/service ${CMD2}"
|
||||
|
||||
.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
|
||||
|
Loading…
Reference in New Issue
Block a user