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 75c4d9e..b1d7503 100644 (file)
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -1,57 +1,21 @@
-#!/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
-       if [ -x /sbin/usplash_write ]
+       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
-       fi
+       else if [ -x /sbin/splashy_update ] ; then
+               /sbin/splashy_update "getstring ${@}" | read nunya
+       fi ; fi
 
        _log_msg "Waiting: ${@} ... \n"
 }
@@ -61,7 +25,7 @@ really_export ()
        STRING="${1}"
        VALUE="$(eval echo -n \${$STRING})"
 
-       if [ -f /live.vars ] && cat /live.vars | grep -sq "export ${STRING}"
+       if [ -f /live.vars ] && grep -sq "export ${STRING}" /live.vars
        then
                sed -i -e 's/\('${STRING}'=\).*$/\1'${VALUE}'/' /live.vars
        else
@@ -75,7 +39,7 @@ lang2locale() {
        langpart="${1%%_*}"
        if [ "$1" != "C" ]; then
                # Match the language code with 3rd field in languagelist
-               line=$(grep -v "^#" /root/usr/share/live-initramfs/languagelist | cut -f3,4,5 -d\; | grep -v ';C$' | grep "^$langpart;")
+               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
@@ -100,6 +64,16 @@ lang2locale() {
        fi
 }
 
+# Override maybe_break from scripts/functions
+maybe_break()
+{
+       if [ "${break}" = "$1" ]; then
+               # Call original panic
+               . /scripts/functions
+               panic "Spawning shell within the initramfs"
+       fi
+}
+
 # Override panic from scripts/functions
 panic() {
 
@@ -122,19 +96,18 @@ panic() {
        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 "  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-initramfs will now restart your system. "
+               printf "  live-boot will now restart your system. "
        else
-               printf "  live-initramfs will now start a shell. "
+               printf "  live-boot will now start a shell. "
        fi
        printf "The error message was:\n\n    "