summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark H Weaver <mhw@netris.org>2016-01-22 18:29:40 -0500
committerMark H Weaver <mhw@netris.org>2016-02-03 16:43:42 -0500
commitcc023e320ec9fe5adbbc8b44ddca5f853f8dad42 (patch)
tree5fa72f566b5f0159023d51584169059570e43a67
parent37dd1e6a34698e5bccaf99b6681c503b1a4e5efc (diff)
downloadguix-cc023e320ec9fe5adbbc8b44ddca5f853f8dad42.tar.gz
linux-initrd: Add hid-generic and hid-apple to the default set of modules.
Fixes keyboard of MacBook2,1 during early boot, e.g. for typing a password to
mount an encrypted root partition.

* gnu/system/linux-initrd.scm (base-initrd)[linux-modules]: Add "hid-generic"
  and "hid-apple".
-rw-r--r--gnu/system/linux-initrd.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/gnu/system/linux-initrd.scm b/gnu/system/linux-initrd.scm
index b1ea637de9..37c042b5ab 100644
--- a/gnu/system/linux-initrd.scm
+++ b/gnu/system/linux-initrd.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2014, 2015, 2016 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -179,7 +180,7 @@ loaded at boot time in the order in which they appear."
     ;; Modules added to the initrd and loaded from the initrd.
     `("ahci"                                  ;for SATA controllers
       "usb-storage" "uas"                     ;for the installation image etc.
-      "usbhid"                                ;USB keyboards, for debugging
+      "usbhid" "hid-generic" "hid-apple"      ;keyboards during early boot
       "dm-crypt" "xts"                        ;for encrypted root partitions
       ,@(if (string-match "^(x86_64|i[3-6]86)-" (%current-system))
             '("pata_acpi" "pata_atiixp"    ;for ATA controllers