From 47612c3426b78af70065099f35f6b3236d22a76e Mon Sep 17 00:00:00 2001 From: Igor Date: Wed, 15 Nov 2023 21:29:45 +0100 Subject: [PATCH] Suppress locale warnings at first run when connecting via SSH (#4976) * Suppress locale warnings at first run when connecting via SSH * Move functionality to armbian firstlogin and firstrun scripts --- packages/bsp/common/usr/lib/armbian/armbian-firstlogin | 5 +++++ packages/bsp/common/usr/lib/armbian/armbian-firstrun | 3 +++ 2 files changed, 8 insertions(+) mode change 100644 => 100755 packages/bsp/common/usr/lib/armbian/armbian-firstlogin diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin old mode 100644 new mode 100755 index fb369eff75..582aff1467 --- a/packages/bsp/common/usr/lib/armbian/armbian-firstlogin +++ b/packages/bsp/common/usr/lib/armbian/armbian-firstlogin @@ -431,6 +431,11 @@ if [[ -f /root/.not_logged_in_yet && -n $(tty) ]]; then printf "\nYou selected \e[0;91mZSH\x1B[0m as your default shell. If you want to use it right away, please logout and login! \n\n" fi + # re-enable passing locale environment via ssh + sed -e '/^#AcceptEnv LANG/ s/^#//' -i /etc/ssh/sshd_config + # restart sshd daemon + systemctl reload ssh.service + # rpardini: hacks per-dm, very much legacy stuff that works by a miracle if [[ "${desktop_dm}" == "lightdm" ]] && [ -n "$RealName" ]; then diff --git a/packages/bsp/common/usr/lib/armbian/armbian-firstrun b/packages/bsp/common/usr/lib/armbian/armbian-firstrun index 32f3e88c7a..f2dedb7bc6 100755 --- a/packages/bsp/common/usr/lib/armbian/armbian-firstrun +++ b/packages/bsp/common/usr/lib/armbian/armbian-firstrun @@ -52,6 +52,9 @@ case "$1" in # add unique installation id to the image release file sed '1s/^/IMAGE_UUID=/' /proc/sys/kernel/random/uuid >> /etc/armbian-image-release + # disable passing locale environment via ssh + sed -e '/AcceptEnv LANG/ s/^#*/#/' -i /etc/ssh/sshd_config + # SSH Keys creation rm -f /etc/ssh/ssh_host* read entropy_before