X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F14locales;h=0d4e171ab16a7d6dbdb3dd83c1f7a890c3164711;hb=5d98c0a23826c3ee194980c782ebbb2787df4c68;hp=d9343cd6467044ee34d6f5e05cf855ecab9ba9b1;hpb=a4d53091ea5697dd7e3463b1c219a9c622352b9d;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales
index d9343cd..0d4e171 100755
--- a/scripts/casper-bottom/14locales
+++ b/scripts/casper-bottom/14locales
@@ -20,18 +20,33 @@ esac
 
 log_begin_msg "$DESCRIPTION"
 
-locale=en_US.UTF-8
+if [ -e /root/etc/default/locale ]; then
+	grep_file=/root/etc/default/locale
+	locale=$(grep 'LANG=' ${grep_file} | sed s/'LANG='// | tr -d '"' ) 
+elif [ -e /root/etc/environment ]; then # Old locales policy
+	grep_file=/root/etc/environment
+fi
+
+# commandline
 for x in $(cat /proc/cmdline); do
-                case $x in
-                        debian-installer/locale=*)
-                                locale=${x#debian-installer/locale=}
-                                ;;
-                esac
+	case $x in
+		debian-installer/locale=*)
+			locale=${x#debian-installer/locale=}
+			set_locale="true"
+			;;
+	esac
 done
 
-LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
-
-printf 'LANG="%s"\n' "${LANG}" >> /root/etc/environment
-chroot /root /usr/sbin/locale-gen "${LANG}"
+if [ -z "${locale}" ]; then
+	# Set a default one
+	locale=en_US.UTF-8
+	set_locale="true"
+fi
+
+if [ "${set_locale}" ]; then
+	LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
+	printf 'LANG="%s"\n' "${LANG}" >> "${grep_file}" 
+	chroot /root /usr/sbin/locale-gen "${LANG}"
+fi
 
 log_end_msg