01/01: installer: Show "i386" keymaps for x86, arm.

[Danny Milosavljevic]

dannym pushed a commit to branch wip-installer-2
in repository guix.

commit 81661d4486431fd5dd3a23f3dd2378b9e04121c9
Author: Danny Milosavljevic <address@hidden>
Date:   Wed Jul 5 17:25:36 2017 +0200

    installer: Show "i386" keymaps for x86, arm.
    
    * gnu/system/installer/guixsd-installer.scm (base-page-key-handler): Modify.
---
 gnu/system/installer/guixsd-installer.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/system/installer/guixsd-installer.scm 
b/gnu/system/installer/guixsd-installer.scm
index 17c27ac..e786220 100644
--- a/gnu/system/installer/guixsd-installer.scm
+++ b/gnu/system/installer/guixsd-installer.scm
@@ -184,7 +184,15 @@
       (#f #f)  ;; Do nothing if loadkeys is not found
       (loadkeys-directory
        (let* ((keymap-directory
-               (string-append (dirname loadkeys-directory) 
"/../share/keymaps"))
+               (string-append (dirname loadkeys-directory) "/../share/keymaps"
+                              (match (utsname:machine (uname))
+                                ("i686" "/i386")
+                                ("x86_64" "/i386")
+                                ("aarch64" "/i386")
+                                ("armv7l" "/i386")
+                                ("powerpc" "/ppc")
+                                ("ppc64" "/ppc")
+                                (_ ""))))
               (p (make-key-map
                   page keymap-directory)))
          (page-enter p)))))))