diff options
| author | Renato Botelho <renato@netgate.com> | 2015-12-22 10:55:47 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-12-22 10:55:47 -0200 |
| commit | 109a7ad1ec5fcb58bce8d91fa982b503050dcf06 (patch) | |
| tree | d9e78329f327edd0a32a31a41466357b4210a662 /etc | |
| parent | cfe34c66a5ecf4b4d0db428dcaa83bc1959944e9 (diff) | |
| parent | df0dedf653f6c09947ccd61ca9509629c4fb7d2f (diff) | |
| download | FreeBSD-src-109a7ad1ec5fcb58bce8d91fa982b503050dcf06.zip FreeBSD-src-109a7ad1ec5fcb58bce8d91fa982b503050dcf06.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.subr | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/rc.subr b/etc/rc.subr index b908f1b..5048c52 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -974,6 +974,14 @@ run_rc_command() fi fi + if [ $rc_arg = "start" -a -z "$rc_fast" -a -n "$rc_pid" ]; then + if [ -z "$rc_quiet" ]; then + echo 1>&2 "${name} already running? " \ + "(pid=$rc_pid)." + fi + return 1 + fi + # if there's a custom ${XXX_cmd}, # run that instead of the default # @@ -1002,14 +1010,6 @@ run_rc_command() ;; start) - if [ -z "$rc_fast" -a -n "$rc_pid" ]; then - if [ -z "$rc_quiet" ]; then - echo 1>&2 "${name} already running? " \ - "(pid=$rc_pid)." - fi - return 1 - fi - if [ ! -x "${_chroot}${_chroot:+/}${command}" ]; then warn "run_rc_command: cannot run $command" return 1 |
