X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=0684dc052a2baf48d8b691b18b4b38ef3b9a78b3;hb=c2102d9620c54541825f267d1b9575d886e8b820;hp=d86a3f6c71f32974fd2b9a724c0e535f10d2a341;hpb=4e024dff26b33878ca7ef61fc108fc2de7d5c4cb;p=live-boot-grml.git

diff --git a/scripts/live-functions b/scripts/live-functions
index d86a3f6..0684dc0 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -1,8 +1,48 @@
-#!/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
@@ -12,7 +52,7 @@ log_wait_msg ()
 		read nunya < /dev/.initramfs/usplash_outfifo
 	fi
 
-	_log_msg "Waiting: ${@} ..."
+	_log_msg "Waiting: ${@} ... \n"
 }
 
 really_export ()
@@ -62,10 +102,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"
@@ -77,7 +117,7 @@ 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"