X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fcasper-bottom%2F14locales;h=18ed15ed90fa181e5cb4bb1ff3e9c52201141314;hb=beec4f9fb766be23d575b070e398639d5a4a9c9d;hp=ebe76164dda15a8ded1fe1dcf183c6442ccc3b57;hpb=a4a7503df76005df67b006e1324004c808830c32;p=live-boot-grml.git

diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales
index ebe7616..18ed15e 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,36 +21,60 @@ 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=*)
-			locale=${x#debian-installer/locale=}
-			set_locale="true"
-			;;
-		locale=*)
-			locale=${x#locale=}
-			set_locale="true"
-			;;
-	esac
-done
+if [ ! -z "${LOCALE}" ]; then
+    locale="${LOCALE}"
+    set_locale="true"
+fi
 
 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}"
+    if echo "${locale}" | grep -sqE '^[[:lower:]]{2}$' ; then
+        # input is like "locale=it", so we will convert and setup also the keyboard if not already set
+        if [ -z "${KBD}" ]; then
+            # FIXME: look if this keyb is supported
+            KBD="${locale}"
+            really_export KBD
+        fi
+        uploc=$(echo "${locale}" | tr '[a-z]' '[A-Z]')
+        locale="${locale}_${uploc}.UTF-8"
+    fi
+
+    LANG=$(grep "^${locale}" /root/usr/share/i18n/SUPPORTED | grep UTF-8 |sed -e 's, .*,,' -e q)
+    if [ -z "${LANG}" ]; then
+        log_warning_message "Locale ${locale} is unsupported."
+        locale="en_US.UTF-8"
+        LANG="${locale}"
+    fi
+
+    really_export LANG
+
+    if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+        printf 'LANG="%s"\n' "${LANG}" > "${grep_file}"
+        chroot /root /usr/sbin/locale-gen "${LANG}"
+        casper-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
+    fi
 fi
 
 log_end_msg