diff options
| author | Eric Badger <badger@FreeBSD.org> | 2016-08-23 02:06:20 +0000 |
|---|---|---|
| committer | Eric Badger <badger@FreeBSD.org> | 2016-08-23 02:06:20 +0000 |
| commit | 6ff6aea62956681f1e60c46d40ad8165543ef35b (patch) | |
| tree | 9aef0ba32ecbee5e806a816de6be43eb4525688c /sbin/resolvconf | |
| parent | 16c2e36059e6cd2f31279ad93f7c87266d074902 (diff) | |
| download | src-6ff6aea62956681f1e60c46d40ad8165543ef35b.tar.gz src-6ff6aea62956681f1e60c46d40ad8165543ef35b.zip | |
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
Notes
Notes:
svn path=/head/; revision=304652
Diffstat (limited to 'sbin/resolvconf')
| -rw-r--r-- | sbin/resolvconf/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile index e831afade9a9..355d72f0c8ac 100644 --- a/sbin/resolvconf/Makefile +++ b/sbin/resolvconf/Makefile @@ -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 |