From 48641d57d478c682398e6135c659be93fafd9f0b Mon Sep 17 00:00:00 2001 From: Richard Tollerton Date: Tue, 22 Jul 2014 15:23:34 -0500 Subject: sysvinit: bootlogd: Honor VERBOSE The messages echoed when starting and stopping bootlogd are currently printed regardless of the setting of VERBOSE. Adjust the initscript so they're only printed when VERBOSE is enabled. (From OE-Core rev: 42f107513148aa6e9fd69d51e63a183c613114c0) Signed-off-by: Richard Tollerton Signed-off-by: Ben Shelton Signed-off-by: Richard Purdie --- meta/recipes-core/sysvinit/sysvinit/bootlogd.init | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init index 7d6518d981..06af465a5b 100755 --- a/meta/recipes-core/sysvinit/sysvinit/bootlogd.init +++ b/meta/recipes-core/sysvinit/sysvinit/bootlogd.init @@ -46,7 +46,7 @@ esac case "$ACTION" in start) - echo -n "Starting $DESC: " + [ "${VERBOSE}" != "no" ] && echo -n "Starting $DESC: " if [ -d /proc/1/. ] then umask 027 @@ -55,10 +55,12 @@ case "$ACTION" in else $DAEMON -r -c fi - echo "$NAME." + [ "${VERBOSE}" != "no" ] && echo "$NAME." ;; stop) - echo -n "Stopping $DESC: " + # stop may get called during bootup, so let it honor + # rcS VERBOSE setting + [ "${VERBOSE}" != "no" ] && echo -n "Stopping $DESC: " start-stop-daemon --stop --quiet --exec $DAEMON if [ "$STOPPER" ] && [ -f /var/log/boot ] && \ @@ -71,7 +73,7 @@ case "$ACTION" in mv boot~ boot.0 fi - echo "$NAME." + [ "${VERBOSE}" != "no" ] && echo "$NAME." ;; restart|force-reload) echo -n "Restarting $DESC: " -- cgit 1.2.3-korg