Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/bsd/openresolv/sbin/resolvconf Wrap our restart com...



details:   https://anonhg.NetBSD.org/src/rev/2195a712ad07
branches:  trunk
changeset: 778535:2195a712ad07
user:      roy <roy%NetBSD.org@localhost>
date:      Tue Apr 03 10:50:46 2012 +0000

description:
Wrap our restart command using if ... then so that we return zero
if it doesn't exist or is not running.
Depend on this Makefile so that if the restart command structure changes
the subscribers are rebuilt.

diffstat:

 external/bsd/openresolv/sbin/resolvconf/Makefile |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (21 lines):

diff -r 15dcf7ae8717 -r 2195a712ad07 external/bsd/openresolv/sbin/resolvconf/Makefile
--- a/external/bsd/openresolv/sbin/resolvconf/Makefile  Tue Apr 03 09:32:53 2012 +0000
+++ b/external/bsd/openresolv/sbin/resolvconf/Makefile  Tue Apr 03 10:50:46 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2009/12/04 14:44:57 roy Exp $
+# $NetBSD: Makefile,v 1.4 2012/04/03 10:50:46 roy Exp $
 #
 
 .include <bsd.own.mk>
@@ -22,9 +22,9 @@
 
 CMD1=          \1 status >/dev/null 2>\&1
 CMD2=          \1 restart
-RESTARTCMD=    /etc/rc.d/${CMD1} \&\& /etc/rc.d/${CMD2}
+RESTARTCMD=    if /etc/rc.d/${CMD1}; then /etc/rc.d/${CMD2}; fi
 .for f in ${SCRIPTS} ${FILES} ${MAN}
-${f}:  ${f}.in
+${f}:  Makefile ${f}.in
        ${TOOL_SED} -e 's:@PREFIX@::g' \
                -e 's:@SYSCONFDIR@:/etc:g' \
                -e 's:@LIBEXECDIR@:/libexec/resolvconf:g' \



Home | Main Index | Thread Index | Old Index