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

diff --git a/scripts/live-functions b/scripts/live-functions
index 01350e8..49b4a3a 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -1,49 +1,7 @@
-#!/bin/sh
 
 . /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
@@ -51,7 +9,9 @@ log_wait_msg ()
 	then
 		/sbin/usplash_write "INPUTENTER ${@}"
 		read nunya < /dev/.initramfs/usplash_outfifo
-	fi
+	else if [ -x /sbin/splashy_update ] ; then
+		/sbin/splashy_update "getstring ${@}" | read nunya
+	fi ; fi
 
 	_log_msg "Waiting: ${@} ... \n"
 }
@@ -103,10 +63,10 @@ lang2locale() {
 # Override panic from scripts/functions
 panic() {
 
-	DEB_1="\033[1;31m ,''\`. \033[0m"
-	DEB_2="\033[1;31m: :' : \033[0m"
-	DEB_3="\033[1;31m\`. \`'  \033[0m"
-	DEB_4="\033[1;31m  \`-   \033[0m"
+	DEB_1="\033[1;31m .''\`.  \033[0m"
+	DEB_2="\033[1;31m: :'  : \033[0m"
+	DEB_3="\033[1;31m\`. \`'\`  \033[0m"
+	DEB_4="\033[1;31m  \`-    \033[0m"
 
 	LIVELOG="\033[1;37m/live.log\033[0m"
 	DEBUG="\033[1;37mdebug\033[0m"
@@ -118,14 +78,13 @@ panic() {
 
 	printf "\n\n"
 	printf "     ${DEB_1}\n"
-	printf "     ${DEB_2}  \033[1;37mBOOT FAILED !!!\033[0m\n"
+	printf "     ${DEB_2}  \033[1;37mBOOT FAILED!\033[0m\n"
 	printf "     ${DEB_3}\n"
 	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"