If there's no lang=... bootoption present default to lang=en.

diff --git a/autoconfig.functions b/autoconfig.functions
index afecb53..c61cb6c 100755 (executable)
--- 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

diff --git a/debian/changelog b/debian/changelog
index bf61905..d3b4d6c 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+grml-autoconfig (0.9.4) unstable; urgency=low
+
+  * If there's no lang=... bootoption present default to lang=en (except
+    for grml-small).
+
+ -- Michael Prokop <mika@grml.org>  Sun, 10 Jan 2010 21:41:24 +0100
+
 grml-autoconfig (0.9.3) unstable; urgency=low
 
   * Add support for dmraid.