Merge lp:~pali/ubuntu/oneiric/lsb/lsb into lp:ubuntu/oneiric/lsb

[Pali]

Write System V init script boot messages to plymouth. It needs this patch:
https://code.launchpad.net/~pali/ubuntu/natty/plymouth/plymouth/+merge/61897

[Martin Pitt (pitti)]

This is blocked on landing https://code.launchpad.net/~pali/ubuntu/natty/plymouth/plymouth/+merge/61897 upstream first, and then needs an update to the current package. I'm setting this to "work in progress", please set back to "needs review" once above happened. Thanks!

Unmerged revisions

45. By Pali on 2011-07-17

Write System V init script boot messages to plymouth

=== modified file 'lsb-base-logging-ubuntu.sh'
--- lsb-base-logging-ubuntu.sh	2011-04-25 17:13:43 +0000
+++ lsb-base-logging-ubuntu.sh	2011-07-18 06:24:34 +0000
@@ -1,6 +1,5 @@
 # Default init script logging functions suitable for Ubuntu.
 # See /lib/lsb/init-functions for usage help.
-LOG_DAEMON_MSG=""
 
 log_use_plymouth () {
     if [ "${loop:-n}" = y ]; then
@@ -9,12 +8,22 @@
     plymouth --ping >/dev/null 2>&1
 }
 
+log_msg_plymouth () {
+    plymouth message --text="log:$@"
+}
+
 log_success_msg () {
-    echo " * $@"
+    if log_use_plymouth; then
+        log_msg_plymouth "$@"
+    else
+        echo " * $@"
+    fi
 }
 
 log_failure_msg () {
-    if log_use_fancy_output; then
+    if log_use_plymouth; then
+        log_msg_plymouth "$@"
+    elif log_use_fancy_output; then
         RED=`$TPUT setaf 1`
         NORMAL=`$TPUT op`
         echo " $RED*$NORMAL $@"
@@ -24,7 +33,9 @@
 }
 
 log_warning_msg () {
-    if log_use_fancy_output; then
+    if log_use_plymouth; then
+        log_msg_plymouth "$@"
+    elif log_use_fancy_output; then
         YELLOW=`$TPUT setaf 3`
         NORMAL=`$TPUT op`
         echo " $YELLOW*$NORMAL $@"
@@ -42,6 +53,11 @@
         return 1
     fi
 
+    if log_use_plymouth; then
+        log_msg_plymouth "$@"
+        return
+    fi
+
     if log_use_fancy_output && $TPUT xenl >/dev/null 2>&1; then
         COLS=`$TPUT cols`
         if [ "$COLS" ] && [ "$COLS" -gt 6 ]; then
@@ -51,15 +67,6 @@
             COL=73
         fi
 
-        if log_use_plymouth; then
-            # If plymouth is running, don't output anything at this time
-            # to avoid buffering problems (LP: #752393)
-            if [ -z "$LOG_DAEMON_MSG" ]; then
-                LOG_DAEMON_MSG=$*
-                return
-            fi
-        fi
-
         # We leave the cursor `hanging' about-to-wrap (see terminfo(5)
         # xenl, which is approximately right). That way if the script
         # prints anything then we will be on the next line and not
@@ -92,16 +99,16 @@
         return 1
     fi
 
+    if log_use_plymouth; then
+        if [ "$1" -eq 0 ]; then
+            log_msg_plymouth "ok"
+        else
+            log_msg_plymouth "failed"
+        fi
+        return $1
+    fi
+
     if [ "$COL" ] && [ -x "$TPUT" ]; then
-        # If plymouth is running, print previously stored output
-        # to avoid buffering problems (LP: #752393)
-        if log_use_plymouth; then
-            if [ -n "$LOG_DAEMON_MSG" ]; then
-                log_daemon_msg $LOG_DAEMON_MSG
-                LOG_DAEMON_MSG=""
-            fi
-        fi
-
         printf "\r"
         $TPUT hpa $COL
         if [ "$1" -eq 0 ]; then
@@ -124,7 +131,11 @@
 }
 
 log_action_msg () {
-    echo " * $@"
+    if log_use_plymouth; then
+        log_msg_plymouth "$@"
+    else
+        echo " * $@"
+   fi
 }
 
 log_action_begin_msg () {