X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=4c37f4b330a0205ca34243e5620f5ecc7045142b;hb=c967ebfc4e43fb16a0c2c140c66900712be95ab7;hp=8bf9c38e7a5f3456c35ef2bc3899bd7d1c9cb34e;hpb=b3416142f2a676acbfca0738ea386d40bef74313;p=live-boot-grml.git diff --git a/scripts/live-functions b/scripts/live-functions index 8bf9c38..4c37f4b 100644 --- a/scripts/live-functions +++ b/scripts/live-functions @@ -35,7 +35,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-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 @@ -111,3 +111,16 @@ 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 +}