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

diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales
index 12cfc4b..18ed15e 100755
--- a/scripts/casper-bottom/14locales
+++ b/scripts/casper-bottom/14locales
@@ -27,6 +27,7 @@ elif [ -e /root/etc/environment ]; then # Old locales policy
 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
@@ -46,27 +47,33 @@ fi
 
 if [ "${set_locale}" ]; then
     if echo "${locale}" | grep -sqE '^[[:lower:]]{2}$' ; then
-        # input is like "locale=it", so we will convert and setup also the keyboard
+        # 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)
 
+    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
 
-    if [ "${BUILD_SYSTEM}" == "Debian" ]; then
-        printf 'LANG=%s\n' "${LANG}" >> "${grep_file}"
-        printf '%s UTF-8\n' "${LANG}" >> /root/etc/locale.gen
-        chroot /root /usr/sbin/locale-gen
-    else
+    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