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

diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales
index 18ed15e..3ee3ef0 100755
--- a/scripts/casper-bottom/14locales
+++ b/scripts/casper-bottom/14locales
@@ -34,10 +34,18 @@ else
 fi
 
 # commandline
-if [ ! -z "${LOCALE}" ]; then
-    locale="${LOCALE}"
-    set_locale="true"
-fi
+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
     # Set a default one
@@ -46,35 +54,10 @@ if [ -z "${locale}" ]; then
 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 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
+    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