Module Name: src
Committed By: roy
Date: Wed Nov 10 14:12:29 UTC 2010
Modified Files:
src/external/bsd/dhcpcd/sbin/dhcpcd: Makefile
Log Message:
Put correct init.d hooks into dhcpcd-run-hooks.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile
diff -u src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.7 src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.8
--- src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile:1.7 Sat Feb 27 15:55:09 2010
+++ src/external/bsd/dhcpcd/sbin/dhcpcd/Makefile Wed Nov 10 14:12:28 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2010/02/27 15:55:09 roy Exp $
+# $NetBSD: Makefile,v 1.8 2010/11/10 14:12:28 roy Exp $
#
PROG= dhcpcd
@@ -34,11 +34,18 @@
CLEANFILES= dhcpcd.conf.5 dhcpcd.8 \
dhcpcd-run-hooks dhcpcd-run-hooks.8
+SERVICEEXISTS= [ -x /etc/rc.d/$$1 ]
+SERVICECMD= /etc/rc.d/$$1 $$2
+SERVICESTATUS= service_command $$1 status >/dev/null 2>\&1
.for f in dhcpcd-run-hooks dhcpcd.conf.5 dhcpcd.8 dhcpcd-run-hooks.8
${f}: ${f}.in
${TOOL_SED} -e 's:@SYSCONFDIR@:/etc:g' -e 's:@DBDIR@:/var/db:g' \
-e 's:@HOOKDIR@:/libexec/dhcpcd-hooks:g' \
- -e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' ${DIST}/${f}.in > $@
+ -e 's:@SCRIPT@:/libexec/dhcpcd-run-hooks:g' \
+ -e 's:@SERVICEEXISTS@:[ -x /etc/rc.d/$$1 ]:g' \
+ -e 's:@SERVICECMD@:/etc/rc.d/$$1 $$2:g' \
+ -e 's:@SERVICESTATUS@:service_command $$1 status >/dev/null 2>\&1:g' \
+ ${DIST}/${f}.in > $@
.endfor
.include <bsd.prog.mk>
