aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2002-03-13 07:57:39 +0000
committerBill Nottingham <notting@redhat.com>2002-03-13 07:57:39 +0000
commit89fcffbebea9e027b33aaf0b189be4f137f455fa (patch)
treecff0d91de0f6ccd8a39eb0dadca1b2af8d895655
parent98bf82e8139255e33edfc7270146b4be9f74a2d4 (diff)
downloadinitscripts-89fcffbebea9e027b33aaf0b189be4f137f455fa.tar
initscripts-89fcffbebea9e027b33aaf0b189be4f137f455fa.tar.gz
initscripts-89fcffbebea9e027b33aaf0b189be4f137f455fa.tar.bz2
initscripts-89fcffbebea9e027b33aaf0b189be4f137f455fa.tar.xz
initscripts-89fcffbebea9e027b33aaf0b189be4f137f455fa.zip
be quiet if $LSB is set
-rwxr-xr-xrc.d/init.d/functions12
1 files changed, 6 insertions, 6 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions
index d025f674..e3c0419e 100755
--- a/rc.d/init.d/functions
+++ b/rc.d/init.d/functions
@@ -136,7 +136,7 @@ daemon() {
ulimit -S -c 0 >/dev/null 2>&1
# Echo daemon
- [ "${BOOTUP:-}" = "verbose" ] && echo -n " $base"
+ [ "${BOOTUP:-}" = "verbose" -a -z "$LSB" ] && echo -n " $base"
# And start it up.
if [ -z "$user" ]; then
@@ -176,7 +176,7 @@ killproc() {
# Kill it.
if [ -n "${pid:-}" ] ; then
- [ "$BOOTUP" = "verbose" ] && echo -n "$base "
+ [ "$BOOTUP" = "verbose" -a -z "$LSB" ] && echo -n "$base "
if [ "$notset" -eq "1" ] ; then
if checkpid $pid 2>&1; then
# TERM first, then KILL if not dead
@@ -355,7 +355,7 @@ success() {
echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
trap - SIGPIPE
fi
- [ "$BOOTUP" != "verbose" ] && echo_success
+ [ "$BOOTUP" != "verbose" -a -z "$LSB" ] && echo_success
return 0
}
@@ -369,7 +369,7 @@ failure() {
echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 2" >&21
trap - SIGPIPE
fi
- [ "$BOOTUP" != "verbose" ] && echo_failure
+ [ "$BOOTUP" != "verbose" -a -z "$LSB" ] && echo_failure
return $rc
}
@@ -383,7 +383,7 @@ passed() {
echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
trap - SIGPIPE
fi
- [ "$BOOTUP" != "verbose" ] && echo_passed
+ [ "$BOOTUP" != "verbose" -a -z "$LSB" ] && echo_passed
return $rc
}
@@ -397,7 +397,7 @@ warning() {
echo "$INITLOG_ARGS -n $0 -s \"$1\" -e 1" >&21
trap - SIGPIPE
fi
- [ "$BOOTUP" != "verbose" ] && echo_warning
+ [ "$BOOTUP" != "verbose" -a -z "$LSB" ] && echo_warning
return $rc
}