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

Collapse All | Expand All

(-)b/libexec/rc/rc.subr (+12 lines)
Lines 52-57 ID="/usr/bin/id" Link Here
52
IDCMD="if [ -x $ID ]; then $ID -un; fi"
52
IDCMD="if [ -x $ID ]; then $ID -un; fi"
53
PS="/bin/ps -ww"
53
PS="/bin/ps -ww"
54
JID=0
54
JID=0
55
# rc_service provides the path to the service script that we are executing.
56
# This is not being set here in an execution context, necessarily, so it's
57
# really just a reasonable guess, and it will get overwritten later if
58
# we are executing from some other means than direct execution by service(8)
59
# or manual invocation of the service script.  The prime example of this is
60
# during system startup, all rc scripts will be invoked via /etc/rc, so
61
# run_rc_script will overwrite rc_service with the file being sourced.
62
rc_service=$0
55
63
56
#
64
#
57
#	functions
65
#	functions
Lines 879-884 check_startmsgs() Link Here
879
#			by $flags from the environment.
887
#			by $flags from the environment.
880
#			This variable may be changed by the precmd method.
888
#			This variable may be changed by the precmd method.
881
#
889
#
890
#       rc_service      Path to the service being executed, in case it needs to
891
#                       re-invoked.
892
#
882
#	rc_pid		PID of command (if appropriate)
893
#	rc_pid		PID of command (if appropriate)
883
#
894
#
884
#	rc_fast		Not empty if "fast" was provided (q.v.)
895
#	rc_fast		Not empty if "fast" was provided (q.v.)
Lines 1382-1387 run_rc_script() Link Here
1382
		required_vars
1393
		required_vars
1383
	eval unset ${_arg}_cmd ${_arg}_precmd ${_arg}_postcmd
1394
	eval unset ${_arg}_cmd ${_arg}_precmd ${_arg}_postcmd
1384
1395
1396
	rc_service=$_file
1385
	case "$_file" in
1397
	case "$_file" in
1386
	/etc/rc.d/*.sh)			# no longer allowed in the base
1398
	/etc/rc.d/*.sh)			# no longer allowed in the base
1387
		warn "Ignoring old-style startup script $_file"
1399
		warn "Ignoring old-style startup script $_file"

Return to bug 234614