[SCM] debian-live branch, master, updated. 1.139.1-2-3-ge4f9125

[Chris Lamb]

The following commit has been merged in the master branch:
commit e4f912515b6c0fef4f20c8dbc4152fa5c90def8e
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Sep 6 13:13:26 2008 +0100

    Remove local overiddes of log_*_msg - #494257 is now fixed in testing.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/scripts/live-functions b/scripts/live-functions
index 7028843..49b4a3a 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -2,47 +2,6 @@
 . /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

-- 
debian-live