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 <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-extended/lsb/lsb/init-functions b/meta/recipes-extended/lsb/lsb/init-functions
index e15827ad52de706d7b98d39e411a1f3a47cf8e90..7c1dce24cf6e01acb99bdca7bd8008bd061f3836 100755 (executable)
--- 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 a716518bdd07a015380629674f1f1e7a923e98ca..10343b081911ea59693a9016acadf0b18fef907e 100755 (executable)
--- 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