diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2016-10-21 14:27:11 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2016-10-21 14:27:11 +0200 |
| commit | e6088f77bee79e2d202b3ded195648e77207bb21 (patch) | |
| tree | 1830edfe34ef7b0bd3367c72d263bc140215dbcd /nixos/modules/system/boot/kernel.nix | |
| parent | 80c2920925fc79ea02ba864b7324bbf7d2bc016d (diff) | |
| download | nixlib-e6088f77bee79e2d202b3ded195648e77207bb21.tar nixlib-e6088f77bee79e2d202b3ded195648e77207bb21.tar.gz nixlib-e6088f77bee79e2d202b3ded195648e77207bb21.tar.bz2 nixlib-e6088f77bee79e2d202b3ded195648e77207bb21.tar.lz nixlib-e6088f77bee79e2d202b3ded195648e77207bb21.tar.xz nixlib-e6088f77bee79e2d202b3ded195648e77207bb21.tar.zst nixlib-e6088f77bee79e2d202b3ded195648e77207bb21.zip | |
initrd: Include i8042 kernel module
For some reason, between Linux 4.4.19 and 4.4.20, the atkbd and libps2 kernel modules lost their dependency on i8042 in modules.dep, causing i8042 not to be included in the initrd. This breaks keyboard in the initrd, in turn breaking LUKS. This only happens on the 16.03 branch; on 16.09, it appears i8042 is pulled into the initrd anyway (through some other dependency, presumably). But let's include it explicitly. http://hydra.nixos.org/build/40468431
Diffstat (limited to 'nixos/modules/system/boot/kernel.nix')
| -rw-r--r-- | nixos/modules/system/boot/kernel.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 51b3b8a3dca9..e751ff141f70 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -214,8 +214,8 @@ in "hid_generic" "hid_lenovo" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" - # Misc. stuff. - "pcips2" "atkbd" + # Misc. keyboard stuff. + "pcips2" "atkbd" "i8042" # Temporary fix for https://github.com/NixOS/nixpkgs/issues/18451 # Remove as soon as upstream gets fixed - marking it: |