summary refs log tree commit diff
path: root/gnu/installer/parted.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-03-25 23:21:08 +0100
committerLudovic Courtès <ludo@gnu.org>2019-03-25 23:37:05 +0100
commit3191b5f6ba5ebbb59a7448facd999ad7f7aeae79 (patch)
tree73d7737ffb85a643a5c4d70a8d26d3e95ae3d3ee /gnu/installer/parted.scm
parentcde08a5120b40e781bd07de6886f262dd02384d0 (diff)
downloadguix-3191b5f6ba5ebbb59a7448facd999ad7f7aeae79.tar.gz
installer: Set the system's 'keyboard-layout' field.
* gnu/installer/newt/keymap.scm (keyboard-layout->configuration): New
procedure.
* gnu/installer.scm (compute-keymap-step): Return RESULT.
(installer-steps) <'keymap>: Add 'configuration-formatter' field.
(installer-program): Use (gnu installer newt keymap).
* gnu/installer/parted.scm (bootloader-configuration): Set
'keyboard-layout'.
Diffstat (limited to 'gnu/installer/parted.scm')
-rw-r--r--gnu/installer/parted.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/installer/parted.scm b/gnu/installer/parted.scm
index 642b8c6d8a..24d048c04c 100644
--- a/gnu/installer/parted.scm
+++ b/gnu/installer/parted.scm
@@ -1258,7 +1258,11 @@ from (gnu system mapped-devices) and return it."
              `((bootloader grub-efi-bootloader)
                (target ,(default-esp-mount-point)))
              `((bootloader grub-bootloader)
-               (target ,root-partition-disk)))))))
+               (target ,root-partition-disk)))
+
+       ;; XXX: Assume we defined the 'keyboard-layout' field of
+       ;; <operating-system> right above.
+       (keyboard-layout keyboard-layout)))))
 
 (define (user-partitions->configuration user-partitions)
   "Return the configuration field for USER-PARTITIONS."