Adding debian version 2.0~a1-1.

[live-boot-grml.git] / scripts / live-functions

diff --git a/scripts/live-functions b/scripts/live-functions
index 7100603..b1d7503 100644 (file)
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -2,34 +2,116 @@
 . /scripts/functions
 . /live.vars
 
-# Override this so we don't call PROGRESS
-log_end_msg()
+log_wait_msg ()
 {
-       if [ -x /sbin/usplash_write ]; then
-               /sbin/usplash_write "SUCCESS ok"
-       fi
-       _log_msg "Done."
+       # Print a message and wait for enter
+       if [ -x /bin/plymouth ] && plymouth --ping
+       then
+               plymouth message --text="$@"
+               plymouth watch-keystroke | read nunya
+       elif [ -x /sbin/usplash_write ]
+       then
+               /sbin/usplash_write "INPUTENTER ${@}"
+               read nunya < /dev/.initramfs/usplash_outfifo
+       else if [ -x /sbin/splashy_update ] ; then
+               /sbin/splashy_update "getstring ${@}" | read nunya
+       fi ; fi
+
+       _log_msg "Waiting: ${@} ... \n"
 }
 
-# Print a message and wait for enter
-log_wait_msg()
+really_export ()
 {
-       if [ -x /sbin/usplash_write ]; then
-               /sbin/usplash_write "INPUTENTER $@"
-               read nunya < /dev/.initramfs/usplash_outfifo
+       STRING="${1}"
+       VALUE="$(eval echo -n \${$STRING})"
+
+       if [ -f /live.vars ] && grep -sq "export ${STRING}" /live.vars
+       then
+               sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars
+       else
+               echo "export ${STRING}=\"${VALUE}\"" >> /live.vars
        fi
-       _log_msg "Waiting: $@ ..."
+
+       eval export "${STRING}"="${VALUE}"
 }
 
-really_export ()
+lang2locale() {
+       langpart="${1%%_*}"
+       if [ "$1" != "C" ]; then
+               # Match the language code with 3rd field in languagelist
+               line=$(grep -v "^#" /usr/share/live-boot/languagelist | cut -f1,3,6 -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
+                               # country as well.
+                               countrypart="${1#*_}"
+                               if [ "$countrypart" = "$1" ]; then
+                                       countryline="$(echo "$line" | head -n1)"
+                                       echo "${countryline##*;}"
+                                       return
+                               fi
+                               countrypart="${countrypart%%[@.]*}"
+                               countryline="$(echo "$line" | grep ";$countrypart;" | head -n1 || true)"
+                               if [ "$countryline" ]; then
+                                       echo "${countryline##*;}"
+                                       return
+                               fi
+                       fi
+                       echo "${line##*;}"
+               fi
+       else
+               echo "C"
+       fi
+}
+
+# Override maybe_break from scripts/functions
+maybe_break()
 {
-    STRING="${1}"
-    VALUE="$(eval echo -n \${$STRING})"
-
-    if [ -f /live.vars ] && cat /live.vars | grep -sq "export ${STRING}" ; then
-        sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars
-    else
-        echo "export ${STRING}=\"${VALUE}\"" >> /live.vars
-    fi
-    eval export "${STRING}"="${VALUE}"
+       if [ "${break}" = "$1" ]; then
+               # Call original panic
+               . /scripts/functions
+               panic "Spawning shell within the initramfs"
+       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-boot' package or email the Debian\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"
+       printf "  extremely useful when diagnosing issues.\n\n"
+
+       if [ -n "${panic}" ]; then
+               printf "  live-boot will now restart your system. "
+       else
+               printf "  live-boot will now start a shell. "
+       fi
+       printf "The error message was:\n\n    "
+
+       # Call original panic
+       . /scripts/functions
+       panic "$@"
 }