summaryrefslogtreecommitdiff
path: root/gnu/installer.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.scm
parentcde08a5120b40e781bd07de6886f262dd02384d0 (diff)
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.scm')
-rw-r--r--gnu/installer.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/installer.scm b/gnu/installer.scm
index 479d940b4a..02f26eead3 100644
--- a/gnu/installer.scm
+++ b/gnu/installer.scm
@@ -1,5 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2018 Mathieu Othacehe <m.othacehe@gmail.com>
+;;; Copyright © 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -156,7 +157,8 @@ selected keymap."
(lambda (models layouts)
((installer-keymap-page current-installer)
layouts)))))
- (#$apply-keymap result))))
+ (#$apply-keymap result)
+ result)))
(define (installer-steps)
(let ((locale-step (compute-locale-step
@@ -208,7 +210,8 @@ selected keymap."
(id 'keymap)
(description (G_ "Keyboard mapping selection"))
(compute (lambda _
- (#$keymap-step current-installer))))
+ (#$keymap-step current-installer)))
+ (configuration-formatter keyboard-layout->configuration))
;; Run a partitioning tool allowing the user to modify
;; partition tables, partitions and their mount points.
@@ -313,6 +316,8 @@ selected keymap."
(gnu installer timezone)
(gnu installer user)
(gnu installer newt)
+ ((gnu installer newt keymap)
+ #:select (keyboard-layout->configuration))
(guix i18n)
(guix build utils)
(ice-9 match))