Override log_*_msg to print nicer status text (until #494257 is merged).
authorChris Lamb <chris@chris-lamb.co.uk>
Sat, 9 Aug 2008 07:51:23 +0000 (08:51 +0100)
committerDaniel Baumann <daniel@debian.org>
Wed, 9 Mar 2011 16:48:01 +0000 (17:48 +0100)
scripts/live-functions

index d86a3f6..01350e8 100644 (file)
@@ -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 ()