X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=blobdiff_plain;f=autoconfig.functions;h=c61cb6c0a8e456d7856bb5af0c069039bb7a0e9d;hp=afecb537d4de6c3db3e42f8d4d26f50df560e10b;hb=31fd87f45ce0cd0014fbe67111741a812a654a86;hpb=b376fd2f366cd8b1746f80a700b4c1aa380e334b

diff --git a/autoconfig.functions b/autoconfig.functions
index afecb53..c61cb6c 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -222,13 +222,14 @@ config_language(){
     [ -n "$LANGUAGE" ] || LANGUAGE='en'
  fi
 
- # if bootoption lang is used update /etc/default/locale, otherwise *not*!
- if [ -n "$BOOT_LANGUAGE" -a -x /usr/sbin/grml-setlang ] ; then
-    if checkgrmlsmall ; then
-       /usr/sbin/grml-setlang "POSIX"
-    else
-       /usr/sbin/grml-setlang "$LANGUAGE"
-    fi
+ if [ -x /usr/sbin/grml-setlang ] ; then
+   # if bootoption lang is used update /etc/default/locale accordingly
+   if [ -n "$BOOT_LANGUAGE" ] ; then
+     checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "$LANGUAGE"
+   # otherwise default to lang=en
+   else
+     checkgrmlsmall && /usr/sbin/grml-setlang "POSIX" || /usr/sbin/grml-setlang "en"
+   fi
  fi
 
  # set console font