View | Details | Raw Unified | Return to bug 221203 | Differences between
and this patch

Collapse All | Expand All

(-)etc/rc.subr (-2 / +8 lines)
Lines 340-351 _find_processes() Link Here
340
		_interpbn=${1##*/}
340
		_interpbn=${1##*/}
341
		_fp_args='_argv'
341
		_fp_args='_argv'
342
		_fp_match='case "$_argv" in
342
		_fp_match='case "$_argv" in
343
		    ${_interp}|"${_interp} "*|"[${_interpbn}]"|"${_interpbn}: ${_procname}"*)'
343
		    ${_interp}|"${_interp} "*|"[${_interpbn}]"|"${_interpbn}: ${_procname}"*${extra_process_match:+|${extra_process_match}})'
344
	else					# a normal daemon
344
	else					# a normal daemon
345
		_procnamebn=${_procname##*/}
345
		_procnamebn=${_procname##*/}
346
		_fp_args='_arg0 _argv'
346
		_fp_args='_arg0 _argv'
347
		_fp_match='case "$_arg0" in
347
		_fp_match='case "$_arg0" in
348
		    $_procname|$_procnamebn|${_procnamebn}:|"(${_procnamebn})"|"[${_procnamebn}]")'
348
		    $_procname|$_procnamebn|${_procnamebn}:|"(${_procnamebn})"|"[${_procnamebn}]"${extra_process_match:+|${extra_process_match}})'
349
	fi
349
	fi
350
350
351
	_proccheck="\
351
	_proccheck="\
Lines 729-734 check_startmsgs() Link Here
729
#
729
#
730
#	extra_commands	n	List of extra commands supported.
730
#	extra_commands	n	List of extra commands supported.
731
#
731
#
732
#	extra_process_match n   A glob used to match the daemon's process, used
733
#				in _find_processes to see if daemon is still
734
#				running.
735
#				Use if the daemon use setproctitle and the
736
#				default globs cannot find the process.
737
#
732
#	pidfile		n	If set, use check_pidfile $pidfile $command,
738
#	pidfile		n	If set, use check_pidfile $pidfile $command,
733
#				otherwise use check_process $command.
739
#				otherwise use check_process $command.
734
#				In either case, only check if $command is set.
740
#				In either case, only check if $command is set.

Return to bug 221203