X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Flive-bottom%2F14locales;h=e53e4877b89986ab1654dac8a8015bc7c99863a5;hb=244fa082e2493d6723dbc425686618126321028c;hp=3cb58dd4244de09ce34ab21f8c9a0216e18baa33;hpb=baa2ce2723e1b7925b596d3fc12a62e8a99e2cb4;p=live-boot-grml.git

diff --git a/scripts/live-bottom/14locales b/scripts/live-bottom/14locales
index 3cb58dd..e53e487 100755
--- a/scripts/live-bottom/14locales
+++ b/scripts/live-bottom/14locales
@@ -18,7 +18,7 @@ case "${1}" in
 		;;
 esac
 
-# live-initramfs header
+# live-boot header
 
 if [ -n "${NOLOCALES}" ]
 then
@@ -27,9 +27,12 @@ fi
 
 . /scripts/live-functions
 
-log_begin_msg "Setting up locales..."
+log_begin_msg "Setting up locales"
 
-# live-initramfs script
+# Cosmetic line wrapping for output of local-gen
+echo
+
+# live-boot script
 
 if [ -e /root/etc/default/locale ]
 then
@@ -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,34 +78,54 @@ 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)
 
-	language="${LANG%%.UTF-8*}"
-	if [ -d /root/etc/default/kdm.d/ ]
+	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)
 
-cat > /root/etc/default/kdm.d/live-autologin << EOF
-LANGUAGE=${language}
-EOF
+		if [ -n "${LANG}" ]
+		then
+			log_warning_msg "Choosing locale '${LANG}' as '${locale}' is unsupported."
+		fi
+	fi
 
-	elif [ -f /root/etc/kde3/kdm/kdmrc ]
+	if [ -z "${LANG}" ]
 	then
-		sed -i -r -e "s/#Language=.*/Language=${language}/" \
-			/root/etc/kde3/kdm/kdmrc
+		log_warning_msg "Locale '${locale}' is unsupported."
+		codepage="UTF-8"
+		language="en_US"
+		locale="${language}.${codepage}"
+		LANG="${language}.${codepage}"
 	fi
 
-	if [ -z "${LANG}" ]
+	if [ -d /root/etc/default/kdm.d/ ]
+	then
+		if ! grep -qs "^LANGUAGE" "${LANG}"
+		then
+			printf 'LANGUAGE=%s\n' "${LANG}" >> /root/etc/default/kdm.d/live-autologin
+		fi
+	elif [ -f /root/etc/kde3/kdm/kdmrc ]
 	then
-		log_warning_message "Locale ${locale} is unsupported."
-		locale="en_US.UTF-8"
-		LANG="${locale}"
+		sed -i -r -e "s/#Language=.*/Language=${language}/" \
+			/root/etc/kde3/kdm/kdmrc
 	fi
 
 	really_export LANG
 
-	printf 'LANG=%s\n' "${LANG}" > "${grep_file}"
-	printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
-	chroot /root /usr/sbin/locale-gen
+	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
+		chroot /root /usr/sbin/locale-gen
+	else
+		chroot /root /usr/sbin/locale-gen > /dev/null 2>&1
+	fi
 fi
 
 log_end_msg