d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Move _rc_subr_loaded=: at the end of the file, to be consistent with NetBSD.

Browse Source 
- Sync with latest version from NetBSD.

'In order to handle some perl scripts running as daemons, add a
pattern which also matches "`basename $interpreter`: $command" in the
ps listing.'

Approved by:	cperciva (mentor)
Obtained from:	NetBSD
MFC after:	1 week
This commit is contained in:
Florent Thoumie 2006-04-18 15:16:55 +00:00
parent 455c5d38be
commit d657eeb6bf
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
etc/rc.subr
View File

@ -1,4 +1,4 @@
# $NetBSD: rc.subr,v 1.65 2004/10/12 14:45:29 lukem Exp $ # $NetBSD: rc.subr,v 1.66 2006/04/01 10:05:50 he Exp $
# $FreeBSD$ # $FreeBSD$
# #
# Copyright (c) 1997-2004 The NetBSD Foundation, Inc. # Copyright (c) 1997-2004 The NetBSD Foundation, Inc.
@ -245,7 +245,9 @@ check_process()
# If interpreter != ".", read the first line of procname, remove the # If interpreter != ".", read the first line of procname, remove the
# leading #!, normalise whitespace, append procname, and attempt to # leading #!, normalise whitespace, append procname, and attempt to
# match that against each command, either as is, or with extra words # match that against each command, either as is, or with extra words
# at the end. # at the end. As an alternative, to deal with interpreted daemons
# using perl, the basename of the interpreter plus a colon is also
# tried as the prefix to procname.
# #
_find_processes() _find_processes()
{ {
@ -265,9 +267,10 @@ _find_processes()
warn "\$command_interpreter $_interpreter != $1" warn "\$command_interpreter $_interpreter != $1"
fi fi
_interp="$* $_procname" # cleanup spaces, add _procname _interp="$* $_procname" # cleanup spaces, add _procname
_interpbn=${1##*/}
_fp_args='_argv' _fp_args='_argv'
_fp_match='case "$_argv" in _fp_match='case "$_argv" in
${_interp}|"${_interp} "*)' ${_interp}|"${_interp} "*|"${_interpbn}: ${_procname}"*)'
else # a normal daemon else # a normal daemon
_procnamebn=${_procname##*/} _procnamebn=${_procname##*/}
_fp_args='_arg0 _argv' _fp_args='_arg0 _argv'
@ -1119,8 +1122,6 @@ backup_file()
fi fi
} }
_rc_subr_loaded=:
# make_symlink src link # make_symlink src link
# Make a symbolic link 'link' to src from basedir. If the # Make a symbolic link 'link' to src from basedir. If the
# directory in which link is to be created does not exist # directory in which link is to be created does not exist
@ -1460,3 +1461,5 @@ find_local_scripts_new () {
} }
fi fi
_rc_subr_loaded=: