From fda7a3fb09b42e59a4d3ab2098229145231a0f29 Mon Sep 17 00:00:00 2001
From: Anton Hvornum <anton@hvornum.se>
Date: Sun, 15 May 2022 21:55:37 +0200
Subject: [PATCH] This allows us to set LANG= in vconsole for keymap
 negotiation during crypt-unlock

---
 archinstall/__init__.py      | 6 +++++-
 archinstall/lib/installer.py | 5 +++++
 archinstall/lib/systemd.py   | 8 ++++++++
 examples/guided.py           | 4 ++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/archinstall/__init__.py b/archinstall/__init__.py
index aa644d48..6d0853c2 100644
--- a/archinstall/__init__.py
+++ b/archinstall/__init__.py
@@ -32,7 +32,11 @@ from .lib.packages.packages import (
 from .lib.profiles import *
 from .lib.services import *
 from .lib.storage import *
-from .lib.systemd import *
+from .lib.systemd import (
+	localectl_status,
+	Boot,
+	Ini
+)
 from .lib.user_interaction import *
 from .lib.menu import Menu
 from .lib.menu.list_manager import ListManager
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index b0f7ac32..dd793055 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -1075,6 +1075,11 @@ class Installer:
 		else:
 			self.log('Keyboard language was not changed from default (no language specified).', fg="yellow", level=logging.INFO)
 
+		# This needs to be explicitly set in some cases due to https://github.com/archlinux/archinstall/issues/596
+		if LANG := localectl_status().get('x11_layout'):
+			with open(f"{self.target}/etc/vconsole.conf", "a") as vconsole:
+				vconsole.write(f"LANG={LANG}\n")
+
 		return True
 
 	def set_x11_keyboard_language(self, language: str) -> bool:
diff --git a/archinstall/lib/systemd.py b/archinstall/lib/systemd.py
index 417870da..55e716ba 100644
--- a/archinstall/lib/systemd.py
+++ b/archinstall/lib/systemd.py
@@ -138,3 +138,11 @@ class Boot:
 			cmd[0] = locate_binary(cmd[0])
 
 		return SysCommandWorker(["systemd-run", f"--machine={self.container_name}", "--pty", *cmd], *args, **kwargs)
+
+def localectl_status():
+	result = {}
+	for line in SysCommand(["localectl", "status"]):
+		key, value = line.strip().decode('UTF-8').split(': ', 1)
+		result[key.lower().replace(' ', '_')] = value
+
+	return result
\ No newline at end of file
diff --git a/examples/guided.py b/examples/guided.py
index f104b7e3..29d6e9a7 100644
--- a/examples/guided.py
+++ b/examples/guided.py
@@ -254,6 +254,10 @@ def perform_installation(mountpoint):
 		if archinstall.arguments.get('custom-commands', None):
 			archinstall.run_custom_user_commands(archinstall.arguments['custom-commands'], installation)
 
+		# After certain locale's has been set, this needs
+		# to be re-run to avoid issues such as https://github.com/archlinux/archinstall/issues/596
+		installation.mkinitcpio('-P')
+
 		installation.log("For post-installation tips, see https://wiki.archlinux.org/index.php/Installation_guide#Post-installation", fg="yellow")
 		if not archinstall.arguments.get('silent'):
 			prompt = str(_('Would you like to chroot into the newly created installation and perform post-installation configuration?'))