From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 25 Feb 2023 12:17:32 +0000 (+0000)
Subject: keymaps: Apply the setting
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=97c340cc697deb06b01280dbdf8ebc7511e273ca;p=people%2Fms%2Fbricklayer.git

keymaps: Apply the setting

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/python/__init__.py b/src/python/__init__.py
index 4d367b9..f4a0c1d 100644
--- a/src/python/__init__.py
+++ b/src/python/__init__.py
@@ -119,6 +119,7 @@ class Bricklayer(object):
 	steps = (
 		step.Welcome,
 		keymaps.SelectKeymap,
+		keymaps.ApplyKeymap,
 		timezones.SelectTimezone,
 		disk.Scan,
 		disk.UnattendedSelectDisk,
diff --git a/src/python/keymaps.py b/src/python/keymaps.py
index aec7da5..1d8743e 100644
--- a/src/python/keymaps.py
+++ b/src/python/keymaps.py
@@ -55,4 +55,15 @@ class SelectKeymap(step.InteractiveStep):
 		# Save in settings
 		self.bricklayer.settings["keymap"] = keymap
 
-		# XXX TODO Actually apply this
+
+class ApplyKeymap(step.Step):
+	"""
+		Applies the keymap
+	"""
+	def run(self):
+		keymap = self.bricklayer.settings.get("keymap")
+
+		# Ignore any errors here, because we might not be able to run this on
+		# a foreign host system.
+		if keymap:
+			self.bricklayer.command(["localectl", "set-keymap", keymap], error_ok=True)