Merge pull request #207 from grml/zeha/locales

SW: GRML_FULL: stop precreating locales

debian/grml-live.maintscript

@@ -1,6 +1,7 @@
 rm_conffile /etc/grml/fai/config/files/etc/apt/grml.key/GRMLBASE 0.32.3~
 rm_conffile /etc/grml/fai/config/files/etc/inittab/GRMLBASE 0.43.0~
 rm_conffile /etc/grml/fai/config/files/etc/inittab/GRML_SMALL 0.43.0~
+rm_conffile /etc/grml/fai/config/files/etc/locale.gen/GRML_FULL 0.49.3~
 rm_conffile /etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE 0.42.3~
 rm_conffile /etc/grml/fai/config/files/etc/systemd/system/[email protected]/override.conf/GRMLBASE 0.33.2~
 rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils 0.33.0~

etc/grml/fai/config/files/etc/locale.gen/GRMLBASE

@@ -7,17 +7,12 @@
 # combinations are possible, but may not be well tested. If you change
 # this file, you need to rerun locale-gen.
 
-de_AT ISO-8859-1
-de_AT.UTF-8 UTF-8
-de_AT@euro ISO-8859-15
-de_CH ISO-8859-1
-de_CH.UTF-8 UTF-8
-de_DE ISO-8859-1
-de_DE.UTF-8 UTF-8
-de_DE@euro ISO-8859-15
-en_GB ISO-8859-1
-en_GB.ISO-8859-15 ISO-8859-15
-en_GB.UTF-8 UTF-8
-en_US ISO-8859-1
-en_US.ISO-8859-15 ISO-8859-15
+# XXX GENERATED XXX
+#
+# NOTE!!! If you change this file by hand, and want to continue
+# maintaining manually, remove the above line. Otherwise, use the command
+# "dpkg-reconfigure locales" to manipulate this file. You can manually
+# change this file without affecting the use of debconf, however, since it
+# does read in your changes.
+
 en_US.UTF-8 UTF-8

etc/grml/fai/config/scripts/GRMLBASE/25-locales

@@ -12,8 +12,8 @@ set -e
 # FAI sets $target, but shellcheck does not know that.
 target=${target:?}
 
-# set up /etc/locale.gen, only GRML_FULL and LOCALES have
-# the full setup, GRMLBASE installs a minimal configuration
+# set up /etc/locale.gen, GRMLBASE installs a minimal configuration.
+# Only if the LOCALES class is added you get a fuller set of locales.
 fcopy -v /etc/locale.gen
 
 # set up /etc/locale.conf, to avoid systemd-firstboot prompting for user input