X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=etc%2Fgrml%2Ffai%2Fconfig%2Fscripts%2FGRMLBASE%2F25-locales;h=73a4afd4c74ced90ecd57f276d064a9f9e5502fd;hb=7ca02816220f36c7db5ca4fe3753990b5c4bc3b2;hp=477a182ab89d65d144d5196c86f0fac0ab731d42;hpb=e08881cde5d29236a5992a0a501b43e88d66732d;p=grml-live.git

diff --git a/etc/grml/fai/config/scripts/GRMLBASE/25-locales b/etc/grml/fai/config/scripts/GRMLBASE/25-locales
index 477a182..73a4afd 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/25-locales
+++ b/etc/grml/fai/config/scripts/GRMLBASE/25-locales
@@ -1,16 +1,23 @@
 #!/bin/sh
-# Filename:      /etc/grml/fai/config/scripts/GRML/25-locales
+# Filename:      /etc/grml/fai/config/scripts/GRMLBASE/25-locales
 # Purpose:       locales (language) configuration of the live system
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
-# Latest change: Sun Sep 16 22:59:23 CEST 2007 [mika]
+# Latest change: Mon Oct 15 20:34:53 CEST 2007 [mika]
 ################################################################################
 
-set -u
 set -e
 
-cp $target/etc/locale.gen.minimal $target/etc/locale.gen
+# use full locales setup only in classes GRML_FULL and LOCALES
+if ifclass GRML_FULL || ifclass LOCALES ; then
+   echo 'Using /etc/locale.gen.grml for locales generation'
+   cp $target/etc/locale.gen.grml $target/etc/locale.gen
+else
+   echo 'Using /etc/locale.gen.minimal for locales generation'
+   cp $target/etc/locale.gen.minimal $target/etc/locale.gen
+fi
+
 $ROOTCMD locale-gen
 
 ## END OF FILE #################################################################