Adding live-initramfs 1.87.1-1.

[live-boot-grml.git] / scripts / casper-bottom / 14locales

diff --git a/scripts/casper-bottom/14locales b/scripts/casper-bottom/14locales
index 5080df6..3ee3ef0 100755 (executable)
--- a/scripts/casper-bottom/14locales
+++ b/scripts/casper-bottom/14locales
@@ -26,17 +26,26 @@ elif [ -e /root/etc/environment ]; then # Old locales policy
     grep_file=/root/etc/environment
 fi
 
-if [ ! -z "${grep_file}" ]; then
+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
-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
@@ -47,11 +56,8 @@ 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}"
-    if [ "${BUILD_SYSTEM}" == "Debian" ]; then
-        chroot /root /usr/sbin/locale-gen
-    else
-        chroot /root /usr/sbin/locale-gen "${LANG}"
-    fi
+    printf '%s UTF-8\n' "${LANG}" > /root/etc/locale.gen
+    chroot /root /usr/sbin/locale-gen "${LANG}"
 fi
 
 log_end_msg