Since rc.subr is a library of functions, it should not use exit
every now and then. It is up to the caller to choose a proper action upon an error condition. Therefore, use return, not exit, except for some special cases. Consistently return 1 to indicate an error. Submitted by: sem (initially) Reviewed by: freebsd-rc (silence) MFC after: 2 weeks
This commit is contained in:
parent
ae275efcae
commit
0ce3dc049a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=153152
12
etc/rc.subr
12
etc/rc.subr
@ -598,12 +598,12 @@ run_rc_command()
|
|||||||
start)
|
start)
|
||||||
if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
|
if [ -z "$rc_fast" -a -n "$rc_pid" ]; then
|
||||||
echo "${name} already running? (pid=$rc_pid)."
|
echo "${name} already running? (pid=$rc_pid)."
|
||||||
exit 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -x ${_chroot}${command} ]; then
|
if [ ! -x ${_chroot}${command} ]; then
|
||||||
info "run_rc_command: cannot run ($command)."
|
info "run_rc_command: cannot run ($command)."
|
||||||
return 0
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# check for required variables,
|
# check for required variables,
|
||||||
@ -681,14 +681,14 @@ $command $rc_flags $command_args"
|
|||||||
|
|
||||||
stop)
|
stop)
|
||||||
if [ -z "$rc_pid" ]; then
|
if [ -z "$rc_pid" ]; then
|
||||||
[ -n "$rc_fast" ] && exit 0
|
[ -n "$rc_fast" ] && return 0
|
||||||
if [ -n "$pidfile" ]; then
|
if [ -n "$pidfile" ]; then
|
||||||
echo \
|
echo \
|
||||||
"${name} not running? (check $pidfile)."
|
"${name} not running? (check $pidfile)."
|
||||||
else
|
else
|
||||||
echo "${name} not running?"
|
echo "${name} not running?"
|
||||||
fi
|
fi
|
||||||
exit 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# if the precmd failed and force
|
# if the precmd failed and force
|
||||||
@ -733,7 +733,7 @@ $command $rc_flags $command_args"
|
|||||||
else
|
else
|
||||||
echo "${name} not running?"
|
echo "${name} not running?"
|
||||||
fi
|
fi
|
||||||
exit 1
|
return 1
|
||||||
fi
|
fi
|
||||||
echo "Reloading ${name} config files."
|
echo "Reloading ${name} config files."
|
||||||
if [ -n "$_precmd" ]; then
|
if [ -n "$_precmd" ]; then
|
||||||
@ -807,7 +807,7 @@ $command $rc_flags $command_args"
|
|||||||
|
|
||||||
echo 1>&2 "$0: unknown directive '$rc_arg'."
|
echo 1>&2 "$0: unknown directive '$rc_arg'."
|
||||||
rc_usage $_keywords
|
rc_usage $_keywords
|
||||||
exit 1
|
# not reached
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user