X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=4c37f4b330a0205ca34243e5620f5ecc7045142b;hb=c967ebfc4e43fb16a0c2c140c66900712be95ab7;hp=d19b0d5b21afbf4e79947a4a1a9bcec3fc24f25d;hpb=1be87e2b9e51755ed766943f4c7f14de14db4b97;p=live-boot-grml.git

diff --git a/scripts/live-functions b/scripts/live-functions
index d19b0d5..4c37f4b 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -21,7 +21,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
@@ -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
+}