summaryrefslogtreecommitdiff
path: root/scripts/live-functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-05-24 15:27:36 +0200
committerDaniel Baumann <daniel@debian.org>2011-03-09 17:52:46 +0100
commite66f79476042794195978ee641aa7ea0d9ca6e0a (patch)
tree90286f281543c1a6f4ad56e229f5ff95438613da /scripts/live-functions
parentad7598cb46a5a6268ca60e5dba156056fb86c09d (diff)
downloadlive-boot-e66f79476042794195978ee641aa7ea0d9ca6e0a.tar.gz
live-boot-e66f79476042794195978ee641aa7ea0d9ca6e0a.zip
Adding debian version 2.0~a1-1.
Diffstat (limited to 'scripts/live-functions')
-rw-r--r--scripts/live-functions21
1 files changed, 4 insertions, 17 deletions
diff --git a/scripts/live-functions b/scripts/live-functions
index 9e138ec..b1d7503 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -39,7 +39,7 @@ lang2locale() {
langpart="${1%%_*}"
if [ "$1" != "C" ]; then
# Match the language code with 3rd field in languagelist
- line=$(grep -v "^#" /usr/share/live-initramfs/languagelist | cut -f1,3,6 -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
@@ -96,7 +96,7 @@ 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 " 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"
@@ -105,9 +105,9 @@ panic() {
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 "
@@ -115,16 +115,3 @@ panic() {
. /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
-}