[SCM] debian-live branch, master, updated. debian/1.136.3-1-23-g08d5478

[Chris Lamb]

The following commit has been merged in the master branch:
commit 08d547843e9c0b7b7c3d1c80983bb9c542eef7da
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Aug 9 08:51:23 2008 +0100

    Override log_*_msg to print nicer status text (until #494257 is merged).
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live-functions b/scripts/live-functions
index d86a3f6..01350e8 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -3,6 +3,47 @@
 . /scripts/functions
 . /live.vars
 
+# Override log_*_msg until #494257 is merged
+
+_log_msg()
+{
+	if [ "$quiet" = "y" ]; then return; fi
+	printf "$@"
+}
+
+log_success_msg()
+{
+	_log_msg "Success: $@\n"
+}
+
+log_failure_msg()
+{
+	_log_msg "Failure: $@\n"
+}
+
+log_warning_msg()
+{
+	_log_msg "Warning: $@\n"
+}
+
+log_begin_msg()
+{
+	if [ -x /sbin/usplash_write ]; then
+		/sbin/usplash_write "TEXT $@"
+	fi
+	_log_msg "Begin: $@ ... "
+}
+
+log_end_msg()
+{
+	if [ -x /sbin/usplash_write ]; then
+		/sbin/usplash_write "SUCCESS ok"
+	fi
+	_log_msg "done.\n"
+}
+
+##
+
 log_wait_msg ()
 {
 	# Print a message and wait for enter
@@ -12,7 +53,7 @@ log_wait_msg ()
 		read nunya < /dev/.initramfs/usplash_outfifo
 	fi
 
-	_log_msg "Waiting: ${@} ..."
+	_log_msg "Waiting: ${@} ... \n"
 }
 
 really_export ()

-- 
debian-live