Fancy output: prepend [info] blocks to log_action_msg calls.

Signed-off-by: Didier Raboud <odyx@debian.org>

diff --git a/debian/lsb-base.README.Debian b/debian/lsb-base.README.Debian
index edf6b3f2ef6d7b752d055b9095677b657a1e31b5..750abbbbabe1c211d10beed4b01460b01a453c02 100644 (file)
--- a/debian/lsb-base.README.Debian
+++ b/debian/lsb-base.README.Debian
@@ -173,6 +173,8 @@ log_daemon_msg_pre
 log_daemon_msg_post
 log_begin_msg_pre (since 4.1+Debian0+fancy0)
 log_begin_msg_post (since 4.1+Debian0+fancy0)
+log_action_msg_pre (since 4.1+Debian0+fancy0+)
+log_action_msg_post (since 4.1+Debian0+fancy0+)
 log_action_begin_msg_pre (since 4.1+Debian0+fancy0)
 log_action_begin_msg_post (since 4.1+Debian0+fancy0)
 log_end_msg_pre

diff --git a/init-functions b/init-functions
index 91a79b48e7c0bf1c7dc00c4bb35f28cad3bb02ce..fbd0b894d444124a6aede45db2eaabb3fdddfefc 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -356,7 +356,9 @@ log_end_msg () {
 }
 
 log_action_msg () {
+    log_action_msg_pre "$@"
     echo "$@."
+    log_action_msg_post "$@"
 }
 
 log_action_begin_msg () {
@@ -425,6 +427,14 @@ log_end_msg_pre () {
     fi
 }
 log_end_msg_post () { :; }
+log_action_msg_pre () {
+    if log_use_fancy_output; then
+        CYAN=$( $TPUT setaf 6)
+        NORMAL=$( $TPUT op)
+        /bin/echo -ne "[${CYAN}info${NORMAL}] "
+    fi
+}
+log_action_msg_post () { :; }
 log_action_begin_msg_pre () {
     log_daemon_msg_pre "$@"
 }