diff options
| author | yar <yar@FreeBSD.org> | 2006-07-26 08:03:24 +0000 |
|---|---|---|
| committer | yar <yar@FreeBSD.org> | 2006-07-26 08:03:24 +0000 |
| commit | 2609e1a6479908bd2a4f08974406a86e4d476e70 (patch) | |
| tree | 3380845565d282657db553b0f813191a5aa03c09 /etc/rc.subr | |
| parent | 5b0112145bf9ca1df2512b6af3761abc1ffd7e57 (diff) | |
| download | FreeBSD-src-2609e1a6479908bd2a4f08974406a86e4d476e70.zip FreeBSD-src-2609e1a6479908bd2a4f08974406a86e4d476e70.tar.gz | |
Back out rev. 1.63. It was a poor idea because
test(1) is built in sh(1) and it always evaluates
both sides of -a or -o, unlike && or || in sh(1).
Requested by: dougb
Diffstat (limited to 'etc/rc.subr')
| -rw-r--r-- | etc/rc.subr | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/etc/rc.subr b/etc/rc.subr index 335f6e9..f89c699 100644 --- a/etc/rc.subr +++ b/etc/rc.subr @@ -575,14 +575,16 @@ run_rc_command() debug "run_rc_command: evaluating ${_precmd}()." eval $_precmd $rc_extra_args _return=$? - [ $_return -ne 0 -a -z "$rc_force" ] && return 1 + [ $_return -ne 0 ] && [ -z "$rc_force" ] && + return 1 fi if [ -n "$_cmd" ]; then debug "run_rc_command: evaluating ${_cmd}()." eval $_cmd $rc_extra_args _return=$? - [ $_return -ne 0 -a -z "$rc_force" ] && return 1 + [ $_return -ne 0 ] && [ -z "$rc_force" ] && + return 1 fi if [ -n "$_postcmd" ]; then @@ -650,7 +652,8 @@ run_rc_command() debug "run_rc_command: evaluating ${_precmd}()." eval $_precmd _return=$? - [ $_return -ne 0 -a -z "$rc_force" ] && return 1 + [ $_return -ne 0 ] && [ -z "$rc_force" ] && + return 1 fi # setup the full command to run @@ -678,7 +681,7 @@ $command $rc_flags $command_args" debug "run_rc_command: _doit: $_doit" eval $_doit _return=$? - [ $_return -ne 0 -a -z "$rc_force" ] && return 1 + [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 # finally, run postcmd # @@ -706,7 +709,8 @@ $command $rc_flags $command_args" if [ -n "$_precmd" ]; then eval $_precmd _return=$? - [ $_return -ne 0 -a -z "$rc_force" ] && return 1 + [ $_return -ne 0 ] && [ -z "$rc_force" ] && + return 1 fi # send the signal to stop @@ -722,7 +726,7 @@ $command $rc_flags $command_args" # eval $_doit _return=$? - [ $_return -ne 0 -a -z "$rc_force" ] && return 1 + [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 # wait for the command to exit, # and run postcmd. @@ -747,7 +751,8 @@ $command $rc_flags $command_args" if [ -n "$_precmd" ]; then eval $_precmd _return=$? - [ $_return -ne 0 -a -z "$rc_force" ] && return 1 + [ $_return -ne 0 ] && [ -z "$rc_force" ] && + return 1 fi _doit="kill -${sig_reload:-HUP} $rc_pid" if [ -n "$_user" ]; then @@ -755,7 +760,7 @@ $command $rc_flags $command_args" fi eval $_doit _return=$? - [ $_return -ne 0 -a -z "$rc_force" ] && return 1 + [ $_return -ne 0 ] && [ -z "$rc_force" ] && return 1 if [ -n "$_postcmd" ]; then eval $_postcmd _return=$? @@ -766,7 +771,8 @@ $command $rc_flags $command_args" if [ -n "$_precmd" ]; then eval $_precmd $rc_extra_args _return=$? - [ $_return -ne 0 -a -z "$rc_force" ] && return 1 + [ $_return -ne 0 ] && [ -z "$rc_force" ] && + return 1 fi # prevent restart being called more # than once by any given script |
