X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Flive-bottom%2F14locales;h=6348338c544b1987ee5290cb712f07a87d43a9e3;hb=34aedd0c9495e0f352eceb260896a1ec10e242b8;hp=2de535e18e5beebdee977c36643c37e13b7f4fa1;hpb=cb896241d0ec8eb2bba0cecd11de3500869176a6;p=live-boot-grml.git

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index 2de535e..6348338 100755
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -27,7 +27,10 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Setting up locales..."
+log_begin_msg "Setting up locales"
+
+# Cosmetic line wrapping for output of local-gen
+echo
 
 # live-initramfs script
 
@@ -44,8 +47,6 @@ if [ -n "${grep_file}" ]
 then
 	# use rootfs configured locale
 	locale=$(grep -s 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' )
-else
-	grep_file=/root/etc/default/locale
 fi
 
 if [ -n "${LOCALE}" ]
@@ -77,26 +78,50 @@ then
 		locale="${locale}_${uploc}.UTF-8"
 	fi
 
-	LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 | sed -e 's, .*,,' -e q)
+	LANG=
+	language="$(echo ${locale} | cut -d. -f1)"
+	eval $(awk '/^'"${locale}"'/ { print "LANG=" $1 " codepage=" $2; exit; }' /root/usr/share/i18n/SUPPORTED)
+
+	if [ -z "${LANG}" ]
+	then
+		# Try and fallback to another codepage for this language.
+		eval $(awk '/^'"${language}"'/ { print "LANG=" $1 " codepage=" $2; exit; }' /root/usr/share/i18n/SUPPORTED)
+
+		if [ -n "${LANG}" ]
+		then
+			log_warning_msg "Choosing locale '${LANG}' as '${locale}' is unsupported."
+		fi
+	fi
 
 	if [ -z "${LANG}" ]
 	then
-		log_warning_message "Locale ${locale} is unsupported."
-		locale="en_US.UTF-8"
-		LANG="${locale}"
+		log_warning_msg "Locale '${locale}' is unsupported."
+		codepage="UTF-8"
+		language="en_US"
+		locale="${language}.${codepage}"
+		LANG="${language}.${codepage}"
+	fi
+
+	if [ -d /root/etc/default/kdm.d/ ]
+	then
+		printf 'LANGUAGE=%s\n' "${LANG}" >> /root/etc/default/kdm.d/live-autologin
+	elif [ -f /root/etc/kde3/kdm/kdmrc ]
+	then
+		sed -i -r -e "s/#Language=.*/Language=${language}/" \
+			/root/etc/kde3/kdm/kdmrc
 	fi
 
 	really_export LANG
 
-	if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+	printf 'LANG="%s"\n' "${LANG}" >> /root/etc/default/locale
+	printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
+	printf '%s %s\n' "${LANG}" "${codepage}" > /root/etc/locale.gen
+
+	if [ -z "${SILENT}" ]
 	then
-		printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
-		chroot /root /usr/sbin/locale-gen "${LANG}"
-		live-preseed /root debian-installer/locale "${locale}"
-	else
-		printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
-		printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
 		chroot /root /usr/sbin/locale-gen
+	else
+		chroot /root /usr/sbin/locale-gen > /dev/null 2>&1
 	fi
 fi