X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F14locales;h=3ee3ef09745065c2f75b3c8da752dd2ab862730f;hb=refs%2Ftags%2Fupstream%2F1.87.1;hp=0d4e171ab16a7d6dbdb3dd83c1f7a890c3164711;hpb=5d98c0a23826c3ee194980c782ebbb2787df4c68;p=live-boot-grml.git

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