From ed52acf61da756951904f693679b976649df21ff Mon Sep 17 00:00:00 2001 From: Doug Barton Date: Sun, 17 Apr 2011 22:31:36 +0000 Subject: [PATCH] The change in r206686 to allow the stop argument to work for a service that is running even though not _enable'd had an annoying side effect. If the service was already started at boot time by another means when the related script came around again in rcorder it would start again, regardless of _enable, because there was a valid pid. [1] So, split the test into 2 parts, one for (!rcvar && !stop), and one for (stop && !valid_pid). This preserves the behavior from r206686 while preventing the undesired side effect. PR: conf/156427 [1] Submitted by: Eugene Grosbein [1] --- etc/rc.subr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/rc.subr b/etc/rc.subr index da1b19872d93..9f3c7b6a7144 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -651,7 +651,8 @@ run_rc_command() # checkyesno ${rcvar} # and return if that failed # - if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a -z "${rc_pid}" ]; then + if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a "$rc_arg" != "stop" ] || + [ -n "${rcvar}" -a "$rc_arg" = "stop" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then if [ -n "${rc_quiet}" ]; then return 0