no need for the custom rc_check if pexp is put in the right place ;)

clue from rpe@
This commit is contained in:
sthen 2014-07-01 21:51:42 +00:00
parent 754cfcf505
commit 92a319405f
3 changed files with 6 additions and 10 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.34 2014/07/01 20:38:44 sthen Exp $
# $OpenBSD: Makefile,v 1.35 2014/07/01 21:51:42 sthen Exp $
COMMENT-main= BIRD internet routing daemon
COMMENT-doc= BIRD internet routing daemon (documentation)
V= 1.4.3
REVISION= 0
REVISION= 1
DISTNAME= bird-$V
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${DISTNAME:S/-/-doc-/}${EXTRACT_SUFX}

View File

@ -1,14 +1,12 @@
#!/bin/sh
#
# $OpenBSD: bird.rc,v 1.3 2014/07/01 20:38:44 sthen Exp $
# $OpenBSD: bird.rc,v 1.4 2014/07/01 21:51:42 sthen Exp $
daemon="${TRUEPREFIX}/sbin/bird"
. /etc/rc.d/rc.subr
rc_check() {
pgrep -q -f "^${pexp}$"
}
pexp="${daemon}${daemon_flags:+ ${daemon_flags}}$"
rc_stop() {
${TRUEPREFIX}/sbin/birdc down

View File

@ -1,14 +1,12 @@
#!/bin/sh
#
# $OpenBSD: bird6.rc,v 1.3 2014/07/01 20:38:44 sthen Exp $
# $OpenBSD: bird6.rc,v 1.4 2014/07/01 21:51:42 sthen Exp $
daemon="${TRUEPREFIX}/sbin/bird6"
. /etc/rc.d/rc.subr
rc_check() {
pgrep -q -f "^${pexp}$"
}
pexp="${daemon}${daemon_flags:+ ${daemon_flags}}$"
rc_stop() {
${TRUEPREFIX}/sbin/birdc6 down