X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-functions;h=9e138ecde09a962224ece714e36dbe79b60f1b53;hb=refs%2Ftags%2Fupstream%2F1.236.2;hp=8bf9c38e7a5f3456c35ef2bc3899bd7d1c9cb34e;hpb=e0a050e3bcf51cf0bb1df9490487e0619d4aa9f9;p=live-boot-grml.git

diff --git a/scripts/live-functions b/scripts/live-functions
index 8bf9c38..9e138ec 100644
--- a/scripts/live-functions
+++ b/scripts/live-functions
@@ -5,7 +5,11 @@
 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
@@ -35,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-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 +115,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
+}