-#!/bin/sh
. /scripts/functions
. /live.vars
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: ${@} ..."
+ _log_msg "Waiting: ${@} ... \n"
}
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
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-initramfs/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
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() {
- 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"
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 " 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"
. /scripts/functions
panic "$@"
}
+
+load_confmodule ()
+{
+ # Only do this once
+ if [ -z "$DEBCONF_REDIR" ]
+ then
+ exec <&4
+ export DEBIAN_HAS_FRONTEND=1
+ export DEBCONF_REDIR=1
+ fi
+
+ . /root/usr/share/debconf/confmodule
+}