Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archinstall
diff options
context:
space:
mode:
authorcodefiles <11915375+codefiles@users.noreply.github.com>2024-03-10 04:34:32 -0400
committerGitHub <noreply@github.com>2024-03-10 09:34:32 +0100
commit2a33d7cd974b57c0e69b0d4998e9bfe06af86b62 (patch)
tree8dbeecdd8b0e16c8c7d17a7229e4d3f77b4074f8 /archinstall
parent635ae335bed8b05d56f886b61dc58c1c9f1cb4b3 (diff)
Set keyboard layout in minimal installation (#2399)
Diffstat (limited to 'archinstall')
-rw-r--r--archinstall/lib/installer.py1
-rw-r--r--archinstall/scripts/guided.py4
-rw-r--r--archinstall/scripts/swiss.py4
3 files changed, 1 insertions, 8 deletions
diff --git a/archinstall/lib/installer.py b/archinstall/lib/installer.py
index 2b2af06e..41113899 100644
--- a/archinstall/lib/installer.py
+++ b/archinstall/lib/installer.py
@@ -714,6 +714,7 @@ class Installer:
# sys_command('/usr/bin/arch-chroot /mnt hwclock --hctosys --localtime')
self.set_hostname(hostname)
self.set_locale(locale_config)
+ self.set_keyboard_language(locale_config.kb_layout)
# TODO: Use python functions for this
SysCommand(f'/usr/bin/arch-chroot {self.target} chmod 700 /root')
diff --git a/archinstall/scripts/guided.py b/archinstall/scripts/guided.py
index f56ce5b4..b1fc8fd9 100644
--- a/archinstall/scripts/guided.py
+++ b/archinstall/scripts/guided.py
@@ -193,10 +193,6 @@ def perform_installation(mountpoint: Path):
if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
installation.user_set_pw('root', root_pw)
- # This step must be after profile installs to allow profiles_bck to install language pre-requisites.
- # After which, this step will set the language both for console and x11 if x11 was installed for instance.
- installation.set_keyboard_language(locale_config.kb_layout)
-
if profile_config := archinstall.arguments.get('profile_config', None):
profile_config.profile.post_install(installation)
diff --git a/archinstall/scripts/swiss.py b/archinstall/scripts/swiss.py
index 8a5488bc..8813fd91 100644
--- a/archinstall/scripts/swiss.py
+++ b/archinstall/scripts/swiss.py
@@ -245,10 +245,6 @@ def perform_installation(mountpoint: Path, exec_mode: ExecutionMode):
if (root_pw := archinstall.arguments.get('!root-password', None)) and len(root_pw):
installation.user_set_pw('root', root_pw)
- # This step must be after profile installs to allow profiles_bck to install language pre-requisites.
- # After which, this step will set the language both for console and x11 if x11 was installed for instance.
- installation.set_keyboard_language(locale_config.kb_layout)
-
if profile_config := archinstall.arguments.get('profile_config', None):
profile_config.profile.post_install(installation)