diff options
author | Richard Tollerton <rich.tollerton@ni.com> | 2014-07-22 15:23:34 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-07-23 21:59:16 +0100 |
commit | 48641d57d478c682398e6135c659be93fafd9f0b (patch) | |
tree | 60f9e159838208e1bf8403ebddfc1fb04746558c | |
parent | 063ee04d47d3aea5de2220a0090a173d4d82b662 (diff) | |
download | poky-48641d57d478c682398e6135c659be93fafd9f0b.tar.gz |
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 <rich.tollerton@ni.com>
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | meta/recipes-core/sysvinit/sysvinit/bootlogd.init | 10 |
1 files changed, 6 insertions, 4 deletions
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 | |||
46 | 46 | ||
47 | case "$ACTION" in | 47 | case "$ACTION" in |
48 | start) | 48 | start) |
49 | echo -n "Starting $DESC: " | 49 | [ "${VERBOSE}" != "no" ] && echo -n "Starting $DESC: " |
50 | if [ -d /proc/1/. ] | 50 | if [ -d /proc/1/. ] |
51 | then | 51 | then |
52 | umask 027 | 52 | umask 027 |
@@ -55,10 +55,12 @@ case "$ACTION" in | |||
55 | else | 55 | else |
56 | $DAEMON -r -c | 56 | $DAEMON -r -c |
57 | fi | 57 | fi |
58 | echo "$NAME." | 58 | [ "${VERBOSE}" != "no" ] && echo "$NAME." |
59 | ;; | 59 | ;; |
60 | stop) | 60 | stop) |
61 | echo -n "Stopping $DESC: " | 61 | # stop may get called during bootup, so let it honor |
62 | # rcS VERBOSE setting | ||
63 | [ "${VERBOSE}" != "no" ] && echo -n "Stopping $DESC: " | ||
62 | start-stop-daemon --stop --quiet --exec $DAEMON | 64 | start-stop-daemon --stop --quiet --exec $DAEMON |
63 | 65 | ||
64 | if [ "$STOPPER" ] && [ -f /var/log/boot ] && \ | 66 | if [ "$STOPPER" ] && [ -f /var/log/boot ] && \ |
@@ -71,7 +73,7 @@ case "$ACTION" in | |||
71 | mv boot~ boot.0 | 73 | mv boot~ boot.0 |
72 | fi | 74 | fi |
73 | 75 | ||
74 | echo "$NAME." | 76 | [ "${VERBOSE}" != "no" ] && echo "$NAME." |
75 | ;; | 77 | ;; |
76 | restart|force-reload) | 78 | restart|force-reload) |
77 | echo -n "Restarting $DESC: " | 79 | echo -n "Restarting $DESC: " |