diff options
| author | Bill Nottingham <notting@redhat.com> | 2001-01-23 20:15:59 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2001-01-23 20:15:59 +0000 |
| commit | 3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72 (patch) | |
| tree | 0f0e78f3634deed3d2c36161430ecbdbd6b53bf2 /rc.d/init.d/functions | |
| parent | a4a25465cd2844d72bf518188b813c009450f505 (diff) | |
| download | initscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.tar initscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.tar.gz initscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.tar.bz2 initscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.tar.xz initscripts-3b0c07cb110c35ecb9b68ccc0fce8ed5f865cd72.zip | |
tag action, runcmd, etc. lines as well
Diffstat (limited to 'rc.d/init.d/functions')
| -rwxr-xr-x | rc.d/init.d/functions | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 4638b709..d9611b5c 100755 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -115,9 +115,9 @@ daemon() { # And start it up. if [ -z "$daemon_user" ]; then - nice -n $nicelevel initlog $INITLOG_ARGS -c "$*" && success "$base startup" || failure "$base startup" + nice -n $nicelevel initlog $INITLOG_ARGS -c "$*" && success $"$base startup" || failure $"$base startup" else - nice -n $nicelevel initlog $INITLOG_ARGS -c "su $daemon_user -c \"$*\"" && success "$base startup" || failure "$base startup" + nice -n $nicelevel initlog $INITLOG_ARGS -c "su $daemon_user -c \"$*\"" && success $"$base startup" || failure $"$base startup" fi } @@ -171,18 +171,18 @@ killproc() { fi checkpid $pid >/dev/null 2>&1 RC=$? - [ $RC -eq 0 ] && failure "$base shutdown" || success "$base shutdown" + [ $RC -eq 0 ] && failure $"$base shutdown" || success $"$base shutdown" RC=$((! $RC)) # use specified level only else if checkpid $pid >/dev/null 2>&1; then kill $killlevel $pid RC=$? - [ $RC -eq 0 ] && success "$base $killlevel" || failure "$base $killlevel" + [ $RC -eq 0 ] && success $"$base $killlevel" || failure $"$base $killlevel" fi fi else - failure "$base shutdown" + failure $"$base shutdown" fi # Remove pid file if any. @@ -292,7 +292,7 @@ success() { else # silly hack to avoid EPIPE killing rc.sysinit trap "" SIGPIPE - echo $"$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21 + echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21 trap - SIGPIPE fi [ "$BOOTUP" != "verbose" ] && echo_success @@ -306,7 +306,7 @@ failure() { initlog $INITLOG_ARGS -n $0 -s "$1" -e 2 else trap "" SIGPIPE - echo $"$INITLOG_ARGS -n $0 -s \"$1\" -e 2" >&21 + echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 2" >&21 trap - SIGPIPE fi [ "$BOOTUP" != "verbose" ] && echo_failure @@ -320,7 +320,7 @@ passed() { initlog $INITLOG_ARGS -n $0 -s "$1" -e 1 else trap "" SIGPIPE - echo $"$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21 + echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21 trap - SIGPIPE fi [ "$BOOTUP" != "verbose" ] && echo_passed @@ -330,9 +330,9 @@ passed() { # Run some action. Log its output. action() { STRING=$1 - echo -n $"$STRING " + echo -n "$STRING " shift - initlog $INITLOG_ARGS -c "$*" && success $"$STRING" || failure $"$STRING" + initlog $INITLOG_ARGS -c "$*" && action $"$STRING" || action $"$STRING" rc=$? echo return $rc |