diff options
| author | pfg <pfg@FreeBSD.org> | 2017-02-20 03:26:19 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2017-02-20 03:26:19 +0000 |
| commit | 3c4b6c4becf1f0078e5df17d458c36274d426a68 (patch) | |
| tree | 6bde402009f52c324fc12d3d63b6eb63e7181456 /sbin | |
| parent | 2ba697fdcfebe81aafcf43d6f7d330ec1235fb45 (diff) | |
| download | FreeBSD-src-3c4b6c4becf1f0078e5df17d458c36274d426a68.zip FreeBSD-src-3c4b6c4becf1f0078e5df17d458c36274d426a68.tar.gz | |
MFC r312992:
MFV r312970, 313160:
openresolv: update to version 3.9.0.
It is now possible to drop the _WITH_ARG vars thanks to a change to the
pdns_recursor upstreamed by Guy Yur.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/resolvconf/Makefile | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile index 355d72f..db33656 100644 --- a/sbin/resolvconf/Makefile +++ b/sbin/resolvconf/Makefile @@ -20,9 +20,6 @@ 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_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}" @@ -32,7 +29,6 @@ ${f}: ${f}.in 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' \ |
