diff options
| author | dougb <dougb@FreeBSD.org> | 2010-04-15 21:18:24 +0000 |
|---|---|---|
| committer | dougb <dougb@FreeBSD.org> | 2010-04-15 21:18:24 +0000 |
| commit | 01137d93391442d08f0e2535b78cbc0e25bd15f8 (patch) | |
| tree | 75271c77703355f5898f89f15b12ea9c0bffe413 /etc/rc.subr | |
| parent | 0fc8400052f0fcd34562f88ac617943a865b63e5 (diff) | |
| download | FreeBSD-src-01137d93391442d08f0e2535b78cbc0e25bd15f8.zip FreeBSD-src-01137d93391442d08f0e2535b78cbc0e25bd15f8.tar.gz | |
If a service is running, make 'stop' work even if ${name}_enable
is not set.
PR: conf/130414
Submitted by: Dominic Fandrey <kamikaze@bsdforen.de>
Reviewed by: freebsd-rc@
Diffstat (limited to 'etc/rc.subr')
| -rw-r--r-- | etc/rc.subr | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/etc/rc.subr b/etc/rc.subr index 18273be..397af1d 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -646,12 +646,12 @@ run_rc_command() if [ "$_elem" != "$rc_arg" ]; then continue fi - # if ${rcvar} is set, and $1 is not - # "rcvar", then run + # if ${rcvar} is set, $1 is not "rcvar" + # and ${rc_pid} is not set, then run # checkyesno ${rcvar} # and return if that failed # - if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" ]; then + if [ -n "${rcvar}" -a "$rc_arg" != "rcvar" -a -z "${rc_pid}" ]; then if ! checkyesno ${rcvar}; then if [ -n "${rc_quiet}" ]; then return 0 |
