Move the "left info blocks" code to a hook.

diff --git a/debian/lsb-base.install b/debian/lsb-base.install
index a9b214a2f869e8ea85f0971c6823fb00ee617aac..66dc0df74f6df0e469e7a179cd8451597e994e2e 100644 (file)
--- a/debian/lsb-base.install
+++ b/debian/lsb-base.install
@@ -1 +1,2 @@
 init-functions /lib/lsb
+init-functions.d/20-left-info-blocks /lib/lsb/init-functions.d

diff --git a/debian/lsb-base.lintian-overrides b/debian/lsb-base.lintian-overrides
deleted file mode 100644 (file)
index 200fe08..0000000
--- a/debian/lsb-base.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# This folder is meant for other packages' hooks.
-package-contains-empty-directory lib/lsb/init-functions.d/

diff --git a/init-functions b/init-functions
index c0c45cd61b7dbd473e1b48af57ee39a917200343..ea124d0bbc8f9c2b5cce18b1a0dd23dd4b902860 100644 (file)
--- a/init-functions
+++ b/init-functions
@@ -407,53 +407,17 @@ log_action_end_msg () {
 }
 
 # Hooks for /etc/lsb-base-logging.sh
-log_daemon_msg_pre () {
-    if log_use_fancy_output; then
-        /bin/echo -n "[....] "
-    fi
-}
+log_daemon_msg_pre () { :; }
 log_daemon_msg_post () { :; }
-log_begin_msg_pre () {
-    log_daemon_msg_pre "$@"
-}
-log_begin_msg_post() { :; }
-log_end_msg_pre () {
-    if log_use_fancy_output; then
-        RED=$( $TPUT setaf 1)
-        GREEN=$( $TPUT setaf 2)
-        YELLOW=$( $TPUT setaf 3)
-        NORMAL=$( $TPUT op)
-
-        $TPUT civis
-        $TPUT sc
-        $TPUT hpa 0
-        if [ $1 -eq 0 ]; then
-            /bin/echo -ne "[${GREEN} ok ${NORMAL}"
-        elif [ $1 -eq 255 ]; then
-            /bin/echo -ne "[${YELLOW}warn${NORMAL}"
-        else
-            /bin/echo -ne "[${RED}FAIL${NORMAL}"
-        fi
-        $TPUT rc
-        $TPUT cnorm
-    fi
-}
+log_begin_msg_pre () { :; }
+log_begin_msg_post () { :; }
+log_end_msg_pre () { :; }
 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_pre () { :; }
 log_action_msg_post () { :; }
-log_action_begin_msg_pre () {
-    log_daemon_msg_pre "$@"
-}
+log_action_begin_msg_pre () { :; }
 log_action_begin_msg_post () { :; }
-log_action_end_msg_pre () {
-    log_end_msg_pre "$@"
-}
+log_action_end_msg_pre () { :; }
 log_action_end_msg_post () { :; }
 
 # Include hooks from other packages in /lib/lsb/init-functions.d

diff --git a/init-functions.d/20-left-info-blocks b/init-functions.d/20-left-info-blocks
new file mode 100644 (file)
index 0000000..39f6039
--- /dev/null
+++ b/init-functions.d/20-left-info-blocks
@@ -0,0 +1,43 @@
+# Default info blocks put to the left of the screen
+log_daemon_msg_pre () {
+    if log_use_fancy_output; then
+        /bin/echo -n "[....] "
+    fi
+}
+log_begin_msg_pre () {
+    log_daemon_msg_pre "$@"
+}
+log_end_msg_pre () {
+    if log_use_fancy_output; then
+        RED=$( $TPUT setaf 1)
+        GREEN=$( $TPUT setaf 2)
+        YELLOW=$( $TPUT setaf 3)
+        NORMAL=$( $TPUT op)
+
+        $TPUT civis
+        $TPUT sc
+        $TPUT hpa 0
+        if [ $1 -eq 0 ]; then
+            /bin/echo -ne "[${GREEN} ok ${NORMAL}"
+        elif [ $1 -eq 255 ]; then
+            /bin/echo -ne "[${YELLOW}warn${NORMAL}"
+        else
+            /bin/echo -ne "[${RED}FAIL${NORMAL}"
+        fi
+        $TPUT rc
+        $TPUT cnorm
+    fi
+}
+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_begin_msg_pre () {
+    log_daemon_msg_pre "$@"
+}
+log_action_end_msg_pre () {
+    log_end_msg_pre "$@"
+}