D53746.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D53746.id.diff
View Options

	diff --git a/libexec/rc/rc.subr b/libexec/rc/rc.subr
	--- a/libexec/rc/rc.subr
	+++ b/libexec/rc/rc.subr
	@@ -1375,7 +1375,7 @@
	_run_rc_precmd \|\| return 1
	fi
	if ! checkyesno ${name}_svcj; then
	- _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" \|\| return 1
	+ _run_rc_doit "$_cmd $rc_extra_args" \|\| return 1
	else
	case "$rc_arg" in
	start)
	@@ -1404,7 +1404,7 @@
	name=svcj-${name} && _return=0
	fi
	else
	- _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" \|\| _return=1
	+ _run_rc_doit "$_cmd $rc_extra_args" \|\| _return=1
	fi
	;;
	stop)
	@@ -1412,7 +1412,7 @@
	$SERVICE -E _rc_svcj=jailing -j svcj-${name} ${name} ${_rc_prefix}stop $rc_extra_args \|\| _return=1
	$JAIL_CMD -r svcj-${name} 2>/dev/null
	else
	- _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" \|\| _return=1
	+ _run_rc_doit "$_cmd $rc_extra_args" \|\| _return=1
	fi
	;;
	restart\|status) ;; # no special case needed for svcj or handled somewhere else
	@@ -1422,7 +1422,7 @@
	if checkyesno _rc_svcj_extra_cmd && [ "${_rc_svcj}" != jailing ]; then
	$SERVICE -v -E _rc_svcj=jailing -j svcj-${name} ${name} ${_rc_prefix}${rc_arg} $rc_extra_args \|\| _return=1
	else
	- _run_rc_doit "$_cpusetcmd $_cmd $rc_extra_args" \|\| _return=1
	+ _run_rc_doit "$_cmd $rc_extra_args" \|\| _return=1
	fi
	;;
	esac