msw/CISS.debian.installer
SHA256
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V8.00.000.2025.06.17

Browse Source 
Signed-off-by: Marc S. Weidner <msw@coresecret.dev>
This commit is contained in:
Marc S. Weidner
2025-08-03 18:19:19 +02:00
parent 8b407e7bce
commit 998a64a57f
5 changed files with 32 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
func/cdi_4000_debootstrap/4050_setup_locales.sh
View File

@@ -65,7 +65,14 @@ setup_locales() {
set -Ceuo pipefail
sed -i '/^[[:space:]]*[^#[:space:]]/s/^/#/' /etc/locale.gen
if [[ -f /etc/locale.gen ]]; then
sed -i '/^[[:space:]]*[^#[:space:]]/s/^/#/' /etc/locale.gen
else
touch /etc/locale.gen
fi
echo '${locale_locale} UTF-8' >> /etc/locale.gen
@@ -74,20 +81,22 @@ dpkg-reconfigure -f noninteractive locales
locale-gen
update-locale \
LANG=${locale_locale} \
LC_ADDRESS=${locale_override_address:-${locale_locale}} \
LC_COLLATE=${locale_override_collate:-${locale_locale}} \
LC_CTYPE=${locale_override_ctype:-${locale_locale}} \
LC_MEASUREMENT=${locale_override_measurement:-${locale_locale}} \
LC_MESSAGES=${locale_override_messages:-${locale_locale}} \
LC_MONETARY=${locale_override_monetary:-${locale_locale}} \
LC_NAME=${locale_override_name:-${locale_locale}} \
LC_NUMERIC=${locale_override_numeric:-${locale_locale}} \
LC_PAPER=${locale_override_paper:-${locale_locale}} \
LC_TELEPHONE=${locale_override_telephone:-${locale_locale}} \
LC_TIME=${locale_override_time:-${locale_locale}} \
LC_IDENTIFICATION=${locale_locale} \
LC_ALL=
LANG=${locale_locale} \
LC_ADDRESS=${locale_override_address:-${locale_locale}} \
LC_COLLATE=${locale_override_collate:-${locale_locale}} \
LC_CTYPE=${locale_override_ctype:-${locale_locale}} \
LC_MEASUREMENT=${locale_override_measurement:-${locale_locale}} \
LC_MESSAGES=${locale_override_messages:-${locale_locale}} \
LC_MONETARY=${locale_override_monetary:-${locale_locale}} \
LC_NAME=${locale_override_name:-${locale_locale}} \
LC_NUMERIC=${locale_override_numeric:-${locale_locale}} \
LC_PAPER=${locale_override_paper:-${locale_locale}} \
LC_TELEPHONE=${locale_override_telephone:-${locale_locale}} \
LC_TIME=${locale_override_time:-${locale_locale}} \
LC_IDENTIFICATION=${locale_locale} \
LC_ALL=
# vim: number et ts=2 sw=2 sts=2 ai tw=128 ft=sh
EOF
chmod 0700 "${var_locale_hook}"
@@ -124,8 +133,9 @@ EOF
chmod 0644 "${TARGET}/etc/default/keyboard"
do_log "info" "file_only" "4050() Keyboard layout updated: 'XKBLAYOUT=${locale_keyboard_xkb_keymap}' -> '${TARGET}/etc/default/keyboard'."
# TODO: Move this command later than 4131_installation_systemd.sh
### Set the X11 keyboard layout (for graphical environments).
do_in_target "${TARGET}" localectl set-x11-keymap "${locale_keyboard_xkb_keymap}"
#do_in_target "${TARGET}" localectl set-x11-keymap "${locale_keyboard_xkb_keymap}"
return 0
}