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 4d367b9539ba084c3f5170c05261becd0edf1559..f4a0c1dfd2adc2b7a22158e860bec3495ec7f078 100644 (file)
--- 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 aec7da5c599b9b4fe2560b9b2011404adefae2e5..1d8743e348c3b82d197d67989f53a35106d0664c 100644 (file)
--- 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)