pkgsel: add propagation of installer-chosen locale to tasksel

This commit is contained in:
Ark74 2025-08-18 04:54:06 -06:00
parent c058e65f86
commit c8f629bbed
2 changed files with 30 additions and 3 deletions

View file

@ -0,0 +1,24 @@
diff --git a/debian/postinst b/debian/postinst
index 2f35032b..da97a4c7 100755
--- a/debian/postinst
+++ b/debian/postinst
@@ -158,8 +158,18 @@ fi
if db_get pkgsel/run_tasksel && [ "$RET" = true ]; then
log "starting tasksel"
db_progress INFO pkgsel/progress/tasksel
+ # Propagate installer-chosen locale to tasksel so tests/lang can auto-select l10n
+ db_get debian-installer/locale || true
+ LOCALE="$RET"
+ if [ -n "$LOCALE" ]; then
+ LANG="$LOCALE"
+ NOENC="${LOCALE%%.*}"
+ BASE="${NOENC%%_*}"
+ LANGUAGE="${NOENC}:${BASE}"
+ export LANG LANGUAGE
+ fi
apt-install tasksel # ensure tasksel is installed
- DEBIAN_TASKS_ONLY=1 in-target sh -c "tasksel --new-install --debconf-apt-progress='--from $tasksel_start --to $tasksel_end --logstderr'" || aptfailed
+ DEBIAN_TASKS_ONLY=1 in-target sh -c "LANG='$LANG' LANGUAGE='$LANGUAGE' tasksel --new-install --debconf-apt-progress='--from $tasksel_start --to $tasksel_end --logstderr'" || aptfailed
fi
if db_get pkgsel/include/install-recommends; then

View file

@ -1,5 +1,6 @@
#!/bin/sh #!/bin/sh
# #
# Copyright (C) 2025 Luis Guzmán <ark@switnet.org>
# Copyright (C) 2009-2021 Rubén Rodríguez <ruben@gnu.org> # Copyright (C) 2009-2021 Rubén Rodríguez <ruben@gnu.org>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -17,11 +18,13 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
# #
VERSION=2 VERSION=3
EXTERNAL='deb-src http://ftp.debian.org/debian trixie main' EXTERNAL='deb-src http://ftp.debian.org/debian trixie main'
REPOKEY=0E98404D386FA1D9 REPOKEY=6ED0E7B82643E131
NETINST=true NETINST=true
. ./config . ./config
changelog "Rebranded and adapted for Trisquel" apply_patch_changes
changelog "Add propagation of installer-chosen locale to tasksel"
package package