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

diff --git a/scripts/live-functions b/scripts/live-functions
index b6d04fb..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 ()
@@ -34,7 +74,7 @@ lang2locale() {
 	langpart="${1%%_*}"
 	if [ "$1" != "C" ]; then
 		# Match the language code with 3rd field in languagelist
-		line=$(grep -v "^#" /root/usr/share/localechooser/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
+		line=$(grep -v "^#" /root/usr/share/live-initramfs/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
 		if [ -n "$line" ]; then
 			if [ "$(echo "$line" | grep -c '')" -gt 1 ]; then
 				# More than one match; try matching the
@@ -58,3 +98,46 @@ lang2locale() {
 		echo "C"
 	fi
 }
+
+# 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"
+
+	LIVELOG="\033[1;37m/live.log\033[0m"
+	DEBUG="\033[1;37mdebug\033[0m"
+
+	# Reset redirections to avoid buffering
+	exec 1>&6 6>&-
+	exec 2>&7 7>&-
+	kill ${tailpid}
+
+	printf "\n\n"
+	printf "     ${DEB_1}\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 "  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"
+	printf "  extremely useful when diagnosing issues.\n\n"
+
+	if [ -n "${panic}" ]; then
+		printf "  live-initramfs will now restart your system. "
+	else
+		printf "  live-initramfs will now start a shell. "
+	fi
+	printf "The error message was:\n\n    "
+
+	# Call original panic
+	. /scripts/functions
+	panic "$@"
+}