From ee8cec9d7cca98c372c3fdf8122d132cee7a5e92 Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Mon, 27 Feb 2023 21:29:06 +0100
Subject: [PATCH] run locale script on first login

---
 usr/bin/archboot-locale.sh                  | 3 ++-
 usr/lib/archboot/login.sh                   | 3 +++
 usr/lib/initcpio/install/archboot_installer | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/usr/bin/archboot-locale.sh b/usr/bin/archboot-locale.sh
index 75a22f7f2..b9a28bc69 100755
--- a/usr/bin/archboot-locale.sh
+++ b/usr/bin/archboot-locale.sh
@@ -24,6 +24,7 @@ _abort()
 _do_locale() {
     _dialog --infobox "Setting System Wide Locale ${_LOCALE}..." 3 80
     echo "LANG=${_LOCALE}.UTF-8" > /etc/locale.conf
+    echo "LANG=${_LOCALE}.UTF-8" > /tmp/.locale
     echo LC_COLLATE=C >> /etc/locale.conf
     localectl set-locale "${_LOCALE}.UTF-8"
     sleep 2
@@ -40,7 +41,7 @@ _set_locale() {
 
 if [[ -e /tmp/.locale-running ]]; then
     echo "System Wide Locale Setting already runs on a different console!"
-    echo "Please remove /tmp/.locale-running first to launch tz!"
+    echo "Please remove /tmp/.locale-running first!"
     exit 1
 fi 
 : >/tmp/.locale-running
diff --git a/usr/lib/archboot/login.sh b/usr/lib/archboot/login.sh
index 77d2c3194..b4284234b 100644
--- a/usr/lib/archboot/login.sh
+++ b/usr/lib/archboot/login.sh
@@ -152,6 +152,9 @@ else
 fi
 
 if [[ -e /usr/bin/setup ]]; then
+    if ! [[ -e /tmp/.locale ]]; then
+        archboot-locale.sh
+    fi
     _local_mode
     _enter_shell
     if ! [[ -e /tmp/.setup ]]; then
diff --git a/usr/lib/initcpio/install/archboot_installer b/usr/lib/initcpio/install/archboot_installer
index c8f26277b..299275fd3 100644
--- a/usr/lib/initcpio/install/archboot_installer
+++ b/usr/lib/initcpio/install/archboot_installer
@@ -5,7 +5,7 @@
 build ()
 {
     map add_binary genfstab arch-chroot pacstrap \
-    archboot-binary-check.sh archboot-not-installed.sh
+    archboot-binary-check.sh archboot-not-installed.sh archboot-locale.sh
     add_file "/usr/bin/archboot-setup.sh" "/usr/bin/setup"
     add_file "/usr/bin/archboot-quickinst.sh" "/usr/bin/quickinst"
     add_file "/usr/bin/archboot-copy-mountpoint.sh" "/usr/bin/copy-mountpoint.sh"