RomanNum3ral
/
archinstall
mirror of https://github.com/archlinux/archinstall.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

This allows us to set LANG= in vconsole for keymap negotiation during crypt-unlock

This commit is contained in:
Anton Hvornum 2022-05-15 21:55:37 +02:00
parent a748f3fba0
commit fda7a3fb09
No known key found for this signature in database
GPG Key ID: F1234C5BA67C59DF
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
archinstall/__init__.py
View File

@ -32,7 +32,11 @@ from .lib.packages.packages import (
from .lib.profiles import * from .lib.profiles import *
from .lib.services import * from .lib.services import *
from .lib.storage import * from .lib.storage import *
from .lib.systemd import * from .lib.systemd import (
localectl_status,
Boot,
Ini
)
from .lib.user_interaction import * from .lib.user_interaction import *
from .lib.menu import Menu from .lib.menu import Menu
from .lib.menu.list_manager import ListManager from .lib.menu.list_manager import ListManager

5
archinstall/lib/installer.py
View File

@ -1075,6 +1075,11 @@ class Installer:
else: else:
self.log('Keyboard language was not changed from default (no language specified).', fg="yellow", level=logging.INFO) 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 return True
def set_x11_keyboard_language(self, language: str) -> bool: def set_x11_keyboard_language(self, language: str) -> bool:

8
archinstall/lib/systemd.py
View File

@ -138,3 +138,11 @@ class Boot:
cmd[0] = locate_binary(cmd[0]) cmd[0] = locate_binary(cmd[0])
return SysCommandWorker(["systemd-run", f"--machine={self.container_name}", "--pty", *cmd], *args, **kwargs) 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

4
examples/guided.py
View File

@ -254,6 +254,10 @@ def perform_installation(mountpoint):
if archinstall.arguments.get('custom-commands', None): if archinstall.arguments.get('custom-commands', None):
archinstall.run_custom_user_commands(archinstall.arguments['custom-commands'], installation) 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") 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'): if not archinstall.arguments.get('silent'):
prompt = str(_('Would you like to chroot into the newly created installation and perform post-installation configuration?')) prompt = str(_('Would you like to chroot into the newly created installation and perform post-installation configuration?'))