diff options
author | Cristian Iorga <cristian.iorga@intel.com> | 2014-03-27 09:18:17 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-03-27 09:42:07 +0000 |
commit | ebfd07544751611c7ac03e6b1e7a79676ffa0873 (patch) | |
tree | 51c7e37287d80b0afa37efa79df8a31442a68fa6 | |
parent | 61b088abb8a1b09ccaf212ab30eddc93c39b55bf (diff) | |
download | poky-ebfd07544751611c7ac03e6b1e7a79676ffa0873.tar.gz |
lsb: fix lsb_log_msg() implementation
LSB lsb_log_message calls a begin()
function that should be implemented
in /etc/init.d/functions.
The aforementioned script does not
implement the begin() function, as
such there is a small issue related to logging.
This fix implements a local version of
the function, while cleaning up the
troublesome previous implementation.
Fix [YOCTO #5795]
(From OE-Core rev: 365ab9118b6c68aedb2e79129202b385329a8abb)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rwxr-xr-x | meta/recipes-extended/lsb/lsb/init-functions | 7 | ||||
-rwxr-xr-x | meta/recipes-extended/lsb/lsb/lsb_log_message | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/recipes-extended/lsb/lsb/init-functions b/meta/recipes-extended/lsb/lsb/init-functions index e15827ad52..7c1dce24cf 100755 --- a/meta/recipes-extended/lsb/lsb/init-functions +++ b/meta/recipes-extended/lsb/lsb/init-functions | |||
@@ -30,10 +30,15 @@ log_warning_msg () { | |||
30 | /etc/core-lsb/lsb_log_message warning "$@" | 30 | /etc/core-lsb/lsb_log_message warning "$@" |
31 | } | 31 | } |
32 | 32 | ||
33 | # int log_begin_message (char *message) | ||
33 | log_begin_msg () { | 34 | log_begin_msg () { |
34 | /etc/core-lsb/lsb_log_message begin "$@" | 35 | if [ -z "$1" ]; then |
36 | return 1 | ||
37 | fi | ||
38 | echo " * $@" | ||
35 | } | 39 | } |
36 | 40 | ||
41 | |||
37 | log_end_msg () { | 42 | log_end_msg () { |
38 | /etc/core-lsb/lsb_log_message end "$@" | 43 | /etc/core-lsb/lsb_log_message end "$@" |
39 | } | 44 | } |
diff --git a/meta/recipes-extended/lsb/lsb/lsb_log_message b/meta/recipes-extended/lsb/lsb/lsb_log_message index a716518bdd..10343b0819 100755 --- a/meta/recipes-extended/lsb/lsb/lsb_log_message +++ b/meta/recipes-extended/lsb/lsb/lsb_log_message | |||
@@ -21,11 +21,6 @@ case "$ACTION" in | |||
21 | warning "$*" | 21 | warning "$*" |
22 | echo | 22 | echo |
23 | ;; | 23 | ;; |
24 | begin) | ||
25 | echo -n $* | ||
26 | begin "$*" | ||
27 | echo | ||
28 | ;; | ||
29 | *) | 24 | *) |
30 | ;; | 25 | ;; |
31 | esac | 26 | esac |