-#!/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
read nunya < /dev/.initramfs/usplash_outfifo
fi
- _log_msg "Waiting: ${@} ..."
+ _log_msg "Waiting: ${@} ... \n"
}
really_export ()
# 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"
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"