Date: Fri, 3 Feb 2017 10:24:35 +0200 From: Guy Yur <guyyur@gmail.com> To: Pedro Giffuni <pfg@freebsd.org>, freebsd-current <freebsd-current@freebsd.org> Subject: resolvconf Makefile RESTARTCMD sed after r312992 Message-ID: <CAC67Hz-a-zD7ON-yL9o01FXEJsPmfqmrYZ4gegBiN-7sD%2BFvMA@mail.gmail.com>
next in thread | raw e-mail | index | archive | help
[-- Attachment #1 --]
Hi,
In openresolv 3.9.0, the only RESTARTCMD pattern left is @RESTARTCMD@.
The '@RESTARTCMD something@' pattern was dropped from pdns_recursor.in.
r312992 removed RESTARTCMD_WITH_ARG for @RESTARTCMD something@ but
reverted the sed to be '@RESTARTCMD \(.*\)@' and RESTARTCMD= to be
the value of RESTARTCMD_WITH_ARG.
After the change /sbin/resolvconf has 'RESTARTCMD=@RESTARTCMD@' again.
Attaching patch to restore RESTARTCMD=, CMD1=, CMD2= and sed pattern
to values before r312992.
Thanks,
Guy
[-- Attachment #2 --]
Index: sbin/resolvconf/Makefile
===================================================================
--- sbin/resolvconf/Makefile (revision 313137)
+++ sbin/resolvconf/Makefile (working copy)
@@ -20,9 +20,9 @@ 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= \1 onestatus >/dev/null 2>\&1
-CMD2= \1 restart
-RESTARTCMD= /usr/sbin/service ${CMD1} \&\& /usr/sbin/service ${CMD2}
+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 +29,7 @@ ${f}: ${f}.in
sed -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:@RCDIR@:${RCDIR}:g' \
-e 's:@SBINDIR@:${SBINDIR}:g' \
-e 's: vpn : ng[0-9]*&:g' \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAC67Hz-a-zD7ON-yL9o01FXEJsPmfqmrYZ4gegBiN-7sD%2BFvMA>