From 9e41bcd05eadefa83a5358be5d7d1599a6ffe97b Mon Sep 17 00:00:00 2001 From: Chris Hofstaedtler Date: Wed, 11 Dec 2024 16:15:26 +0100 Subject: [PATCH] SW: GRML_FULL: stop precreating locales Given GRML_FULL also includes localepurge, which we expect to purge everything except en_US.UTF-8, creating all these locales seems pointless. The FAQ also documents that only en_US.UTF-8 is supported. --- debian/grml-live.maintscript | 1 + .../fai/config/files/etc/locale.gen/GRMLBASE | 21 ++-- .../fai/config/files/etc/locale.gen/GRML_FULL | 98 ------------------- .../fai/config/scripts/GRMLBASE/25-locales | 4 +- 4 files changed, 11 insertions(+), 113 deletions(-) delete mode 100644 etc/grml/fai/config/files/etc/locale.gen/GRML_FULL diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript index 84f547674..64e76edf8 100644 --- a/debian/grml-live.maintscript +++ b/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/serial-getty@ttyS0.service.d/override.conf/GRMLBASE 0.33.2~ rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils 0.33.0~ diff --git a/etc/grml/fai/config/files/etc/locale.gen/GRMLBASE b/etc/grml/fai/config/files/etc/locale.gen/GRMLBASE index 01eb1d40e..27bc4c141 100644 --- a/etc/grml/fai/config/files/etc/locale.gen/GRMLBASE +++ b/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 diff --git a/etc/grml/fai/config/files/etc/locale.gen/GRML_FULL b/etc/grml/fai/config/files/etc/locale.gen/GRML_FULL deleted file mode 100644 index bd90f599e..000000000 --- a/etc/grml/fai/config/files/etc/locale.gen/GRML_FULL +++ /dev/null @@ -1,98 +0,0 @@ -# This file was deployed via grml-live's -# ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/25-locales script, using -# ${GRML_FAI_CONFIG}/config/files/etc/locale.gen/GRMLBASE -################################################################################ -# This file lists locales that you wish to have built. You can find a list -# of valid supported locales at /usr/share/i18n/SUPPORTED. Other -# combinations are possible, but may not be well tested. If you change -# this file, you need to rerun locale-gen. - -# 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. - -be_BY CP1251 -be_BY@latin UTF-8 -be_BY.UTF-8 UTF-8 -bg_BG CP1251 -bg_BG.UTF-8 UTF-8 -da_DK ISO-8859-1 -da_DK.ISO-8859-15 ISO-8859-15 -da_DK.UTF-8 UTF-8 -de_AT@euro ISO-8859-15 -de_AT ISO-8859-1 -de_AT.UTF-8 UTF-8 -de_BE@euro ISO-8859-15 -de_BE ISO-8859-1 -de_BE.UTF-8 UTF-8 -de_CH ISO-8859-1 -de_CH.UTF-8 UTF-8 -de_DE@euro ISO-8859-15 -de_DE ISO-8859-1 -de_DE.UTF-8 UTF-8 -el_GR ISO-8859-7 -el_GR.UTF-8 UTF-8 -en_AU ISO-8859-1 -en_AU.UTF-8 UTF-8 -en_GB ISO-8859-1 -en_GB.ISO-8859-15 ISO-8859-15 -en_GB.UTF-8 UTF-8 -en_IE@euro ISO-8859-15 -en_IE ISO-8859-1 -en_IE.UTF-8 UTF-8 -en_US ISO-8859-1 -en_US.ISO-8859-15 ISO-8859-15 -en_US.UTF-8 UTF-8 -es_ES@euro ISO-8859-15 -es_ES ISO-8859-1 -es_ES.UTF-8 UTF-8 -fi_FI@euro ISO-8859-15 -fi_FI ISO-8859-1 -fi_FI.UTF-8 UTF-8 -fr_FR@euro ISO-8859-15 -fr_FR ISO-8859-1 -fr_FR.UTF-8 UTF-8 -ga_IE@euro ISO-8859-15 -ga_IE ISO-8859-1 -ga_IE.UTF-8 UTF-8 -he_IL ISO-8859-8 -he_IL.UTF-8 UTF-8 -it_IT@euro ISO-8859-15 -it_IT ISO-8859-1 -it_IT.UTF-8 UTF-8 -ja_JP.EUC-JP EUC-JP -ja_JP.UTF-8 UTF-8 -nl_BE ISO-8859-1 -nl_BE.UTF-8 UTF-8 -nl_BE@euro ISO-8859-15 -nl_NL@euro ISO-8859-15 -nl_NL ISO-8859-1 -nl_NL.UTF-8 UTF-8 -pl_PL ISO-8859-2 -pl_PL.UTF-8 UTF-8 -pt_BR ISO-8859-1 -pt_BR.UTF-8 UTF-8 -pt_PT@euro ISO-8859-15 -pt_PT ISO-8859-1 -pt_PT.UTF-8 UTF-8 -ru_RU.CP1251 CP1251 -ru_RU ISO-8859-5 -ru_RU.KOI8-R KOI8-R -ru_RU.UTF-8 UTF-8 -sk_SK ISO-8859-2 -sk_SK.UTF-8 UTF-8 -sl_SI ISO-8859-2 -sl_SI.UTF-8 UTF-8 -sv_SE ISO-8859-1 -sv_SE.ISO-8859-15 ISO-8859-15 -sv_SE.UTF-8 UTF-8 -tr_TR ISO-8859-9 -tr_TR.UTF-8 UTF-8 -zh_CN GB2312 -zh_CN.UTF-8 UTF-8 -zh_TW BIG5 -zh_TW.UTF-8 UTF-8 diff --git a/etc/grml/fai/config/scripts/GRMLBASE/25-locales b/etc/grml/fai/config/scripts/GRMLBASE/25-locales index 0ac3650e7..d45836666 100755 --- a/etc/grml/fai/config/scripts/GRMLBASE/25-locales +++ b/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