From 365ab9118b6c68aedb2e79129202b385329a8abb Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Thu, 27 Mar 2014 09:18:17 +0200 Subject: 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] Signed-off-by: Cristian Iorga Signed-off-by: Richard Purdie --- meta/recipes-extended/lsb/lsb/init-functions | 7 ++++++- meta/recipes-extended/lsb/lsb/lsb_log_message | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/recipes-extended/lsb') 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 () { /etc/core-lsb/lsb_log_message warning "$@" } +# int log_begin_message (char *message) log_begin_msg () { - /etc/core-lsb/lsb_log_message begin "$@" + if [ -z "$1" ]; then + return 1 + fi + echo " * $@" } + log_end_msg () { /etc/core-lsb/lsb_log_message end "$@" } 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 warning "$*" echo ;; - begin) - echo -n $* - begin "$*" - echo - ;; *) ;; esac -- cgit 1.2.3-korg