diff options
| author | pfg <pfg@FreeBSD.org> | 2016-08-20 02:06:59 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2016-08-20 02:06:59 +0000 |
| commit | c61104e228b303a88081218f2d3b2205da0e6792 (patch) | |
| tree | 2bcae4a1b0a4938111117d62caf9b81dd3e30afb /sbin | |
| parent | 67af67bb3bf4093020f5038fa285c0f6bc5013b5 (diff) | |
| download | FreeBSD-src-c61104e228b303a88081218f2d3b2205da0e6792.zip FreeBSD-src-c61104e228b303a88081218f2d3b2205da0e6792.tar.gz | |
MFC r303062, r303567, r303593:
MFV r298167, r300962, r303048:
openresolv(8): update to version 3.8.1.
Among the new features it attempts to support alternative init systems.
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/resolvconf/Makefile | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/sbin/resolvconf/Makefile b/sbin/resolvconf/Makefile index 783d8b6..e831afa 100644 --- a/sbin/resolvconf/Makefile +++ b/sbin/resolvconf/Makefile @@ -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,7 +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_WITH_ARG}:g' \ + -e 's:@RESTARTCMD@:${RESTARTCMD}:g' \ -e 's:@RCDIR@:${RCDIR}:g' \ -e 's: vpn : ng[0-9]*&:g' \ ${DIST}/$@.in > $@ |
