X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=49b4a3af4ef6e0b46d37133789a5adb2ce89423f;hb=268c4f38f81263be2cf7a400b30008cf214bc619;hp=96d6269270157ace048cd93bc58a87a7aa755250;hpb=364b46b527237033f9b15e6db9aa621ba4b3d35c;p=live-boot-grml.git

diff --git a/scripts/live-functions b/scripts/live-functions
index 96d6269..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
@@ -124,9 +83,8 @@ panic() {
 	printf "     ${DEB_4}  This Debian Live image failed to boot.\n\n"
 
 	printf "  Please file a bug against the 'live-initramfs' package or email the Debian\n"
-	printf "  Live mailing list at <debian-live-devel@lists.alioth.debian.org>, making\n"
-	printf "  sure to note the exact version, name and distribution of the image you were\n"
-	printf "  attempting to boot.\n\n"
+	printf "  Live mailing list at <debian-live@lists.debian.org>, making sure to note the\n"
+	printf "  exact version, name and distribution of the image you were attempting to boot.\n\n"
 
 	printf "  The file ${LIVELOG} contains some debugging information but booting with the\n"
 	printf "  ${DEBUG} command-line parameter will greatly increase its verbosity which is\n"