[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
64/80: installer: Add a console-keymap service.
From: |
John Darrington |
Subject: |
64/80: installer: Add a console-keymap service. |
Date: |
Tue, 3 Jan 2017 15:49:45 +0000 (UTC) |
jmd pushed a commit to branch wip-installer
in repository guix.
commit d5eb5800fbf92d0728fb198c6502ecca51837027
Author: John Darrington <address@hidden>
Date: Sat Dec 31 14:37:54 2016 +0000
installer: Add a console-keymap service.
* gnu/system/installer/configure.scm (generate-guix-config): Add a
console-keymap-service if the key-map variable is not #f.
* gnu/system/installer/file-browser.scm (file-browser-page-key-handler):
Set key-map on enter.
* gnu/system/installer/misc.scm (key-map): New variable.
---
gnu/system/installer/configure.scm | 6 +++++-
gnu/system/installer/file-browser.scm | 14 +++++++-------
gnu/system/installer/misc.scm | 2 ++
3 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/gnu/system/installer/configure.scm
b/gnu/system/installer/configure.scm
index 1878956..b855923 100644
--- a/gnu/system/installer/configure.scm
+++ b/gnu/system/installer/configure.scm
@@ -178,7 +178,11 @@
(list '%base-file-systems)))
(users (cons* %base-user-accounts))
(packages (cons* nss-certs %base-packages))
- (services (cons* %desktop-services))
+ (services (cons*
+ ,@(if key-map
+ `((console-keymap-service ,key-map))
+ `())
+ %desktop-services))
(name-service-switch %mdns-host-lookup-nss)) p)))
diff --git a/gnu/system/installer/file-browser.scm
b/gnu/system/installer/file-browser.scm
index 87d8ef9..35c54cb 100644
--- a/gnu/system/installer/file-browser.scm
+++ b/gnu/system/installer/file-browser.scm
@@ -63,19 +63,19 @@
((and (eqv? ch #\newline)
(menu-active menu))
(let* ((i (menu-get-current-item menu))
- (new-dir (string-append directory "/" i)))
+ (new-dir (string-append directory "/" i)))
(if (eq? 'directory (stat:type (stat new-dir)))
(let ((p (make-file-browser
page new-dir)))
(set! page-stack (cons p page-stack))
((page-refresh p) p))
(begin
- (system* "loadkeys" i)
- (set! page-stack (page-datum page 'exit-point))
- #f)))
- ))
- (std-menu-key-handler menu ch)
- #f))
+ (system* "loadkeys" i)
+ (set! key-map i)
+ (set! page-stack (page-datum page 'exit-point))
+ #f)))))
+ (std-menu-key-handler menu ch)
+ #f))
(define (file-browser-page-refresh page)
diff --git a/gnu/system/installer/misc.scm b/gnu/system/installer/misc.scm
index e9e9083..e0af33d 100644
--- a/gnu/system/installer/misc.scm
+++ b/gnu/system/installer/misc.scm
@@ -23,6 +23,7 @@
#:export (time-zone)
#:export (host-name)
#:export (config-file)
+ #:export (key-map)
#:export (mount-points))
(define livery-title 1)
@@ -32,6 +33,7 @@
(define time-zone "")
(define host-name "")
+(define key-map #f)
(define config-file #f)
- 46/80: installer: Add inetutils bin directory to PATH., (continued)
- 46/80: installer: Add inetutils bin directory to PATH., John Darrington, 2017/01/03
- 33/80: installer: Write the configuration to a temporary file., John Darrington, 2017/01/03
- 61/80: installer: Change the order of the filesystem task conditions., John Darrington, 2017/01/03
- 43/80: gnu: Add guix to the path environment for the guix-installer service., John Darrington, 2017/01/03
- 45/80: installer: Replace an instance of cdr with match., John Darrington, 2017/01/03
- 32/80: installer: Add a task to actually call guix system init., John Darrington, 2017/01/03
- 38/80: installer: Replace some instances of "car"., John Darrington, 2017/01/03
- 26/80: installer: Add a new menu to configure wireless interfaces., John Darrington, 2017/01/03
- 59/80: installer: Prevent the user specifying the same mount point twice., John Darrington, 2017/01/03
- 57/80: installer: Issue message to user on failure of filesystems task., John Darrington, 2017/01/03
- 64/80: installer: Add a console-keymap service.,
John Darrington <=
- 71/80: installer: Make setting up of the network a prerequisite., John Darrington, 2017/01/03
- 55/80: installer: Close unused ports in pipe-cmd., John Darrington, 2017/01/03
- 72/80: installer: Ensure that all mount points are absolute paths., John Darrington, 2017/01/03
- 70/80: installer: Change essid --> wireless., John Darrington, 2017/01/03
- 52/80: installer: Fix bug where window-pipe did not return the proper exit status., John Darrington, 2017/01/03
- 78/80: installer: Rename "file-browser" -> "time-zone"., John Darrington, 2017/01/03
- 75/80: installer: Add predicate for the network task., John Darrington, 2017/01/03
- 50/80: installer: Rename module "new" to "guixsd-installer"., John Darrington, 2017/01/03
- 54/80: installer: Improve install page., John Darrington, 2017/01/03
- 62/80: installer: Use global variable instead of string literal for "/gnu"., John Darrington, 2017/01/03